diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 579f607a0..29c08a6dd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -130,15 +130,15 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
         working-directory: accessibility-checker
     
 ###############################################################################
@@ -149,7 +149,7 @@ jobs:
 
       strategy:
         matrix:
-          node-version: [14.x, 18.x]
+          node-version: [18.x]
 
       steps:
       - uses: actions/checkout@v3
@@ -178,15 +178,15 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Baselines/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Functions.Defined/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.ObjectStructure/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
         working-directory: accessibility-checker
 
 ###############################################################################
@@ -226,9 +226,9 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.mjs
         working-directory: accessibility-checker
 
 ###############################################################################
@@ -268,9 +268,9 @@ jobs:
       - run: npm run build
         working-directory: accessibility-checker
 
-      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.Scans/**/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.Scans/**/*.test.mjs
         working-directory: accessibility-checker
-      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.ObjectStructure/**/*.test.js
+      - run: npx mocha -R dot test/mocha/aChecker.Slow1/aChecker.ObjectStructure/**/*.test.mjs
         working-directory: accessibility-checker
         
 
diff --git a/accessibility-checker-engine/test/v2/checker/accessibility/rules/text_contrast_sufficient_ruleunit/act_pass_10.html b/accessibility-checker-engine/test/v2/checker/accessibility/rules/text_contrast_sufficient_ruleunit/act_pass_10.html
index bf91bb311..46c340a9a 100644
--- a/accessibility-checker-engine/test/v2/checker/accessibility/rules/text_contrast_sufficient_ruleunit/act_pass_10.html
+++ b/accessibility-checker-engine/test/v2/checker/accessibility/rules/text_contrast_sufficient_ruleunit/act_pass_10.html
@@ -7,7 +7,10 @@
 
 <body>
 
-  <button>My button!</button>
+    <!-- Specify the background style because Windows default colors are #f0f0f0 
+        instead of #efefef used by Mac / Linux
+    -->
+  <button style="background-color: #efefef;">My button!</button>
 
 <script type="text/javascript">
         UnitTest = {
diff --git a/accessibility-checker-engine/tsconfig.json b/accessibility-checker-engine/tsconfig.json
index 4f338ec46..cf9d3ca89 100644
--- a/accessibility-checker-engine/tsconfig.json
+++ b/accessibility-checker-engine/tsconfig.json
@@ -9,6 +9,7 @@
         "moduleResolution": "node",
         "alwaysStrict": true,
         "experimentalDecorators": true,
+        "esModuleInterop": true,
         "resolveJsonModule": true,
         // "module": "commonjs",
         "outDir": "dist",
diff --git a/accessibility-checker/.gitignore b/accessibility-checker/.gitignore
index 854bce529..928f4e6cf 100644
--- a/accessibility-checker/.gitignore
+++ b/accessibility-checker/.gitignore
@@ -8,4 +8,5 @@ results
 package-lock.json
 src/**/*.js
 src/**/*.map
-src/**/*.d.ts
\ No newline at end of file
+src/**/*.d.ts
+!src/bin/achecker.js
\ No newline at end of file
diff --git a/accessibility-checker/.mocharc.json b/accessibility-checker/.mocharc.json
new file mode 100644
index 000000000..1ec36e108
--- /dev/null
+++ b/accessibility-checker/.mocharc.json
@@ -0,0 +1,6 @@
+
+{
+    "extension": ["js", "cjs", "mjs"],
+    "package": "./package.json",
+    "node-option": ["experimental-specifier-resolution=node"]
+  }
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/cucumber-selenium/features/Demo.feature b/accessibility-checker/boilerplates/cucumber-selenium/features/Demo.feature
index b743fbdac..0a9a5f114 100644
--- a/accessibility-checker/boilerplates/cucumber-selenium/features/Demo.feature
+++ b/accessibility-checker/boilerplates/cucumber-selenium/features/Demo.feature
@@ -1,15 +1,15 @@
 Feature: Cucumber Demo
     Demonstrate a basic usage of AAT
 
-    Scenario: Check pages and fail when issues found
-        Given I am at URL "http://www.altoromutual.com/"
-        Then Page is accessible with label "DEMO1"
-        When I click on ID "CatLink1"
-        Then Page is accessible with label "DEMO1_Personal"
+#    Scenario: Check pages and fail when issues found
+#        Given I am at URL "https://altoromutual.12mc9fdq8fib.us-south.codeengine.appdomain.cloud/#"
+#        Then Page is accessible with label "DEMO1"
+#        When I click on ID "feedbackButton"
+#        Then Page is accessible with label "DEMO1_Personal"
 
     Scenario: Check pages, but just record results when issues found
-        Given I am at URL "http://www.altoromutual.com/"
+        Given I am at URL "https://altoromutual.12mc9fdq8fib.us-south.codeengine.appdomain.cloud/#"
         Then Scan page for accessibility with label "DEMO2"
-        When I click on ID "CatLink1"
+        When I click on ID "feedbackButton"
         Then Scan page for accessibility with label "DEMO2_Personal"
 
diff --git a/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/browser_step.js b/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/browser_step.js
index adfeef83e..7dd2cd965 100644
--- a/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/browser_step.js
+++ b/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/browser_step.js
@@ -23,11 +23,16 @@ When(/^I click on XPath "([^"]*)"$/, function(selector) {
     });
 });
 
-When(/^I click on ID "([^"]*)"$/, function(selector) {
+When(/^I click on ID "([^"]*)"$/, async function(selector) {
     const myThis = this;
     const condition = until.elementLocated(By.id(selector));
-    return myThis.driver.wait(condition, 8000).then(function() {
-        return myThis.driver.findElement(By.id(selector)).click();
+    return myThis.driver.wait(condition, 8000).then(async function() {
+        let elem = await myThis.driver.findElement(By.id(selector));
+        let rect = await elem.getRect();
+        await myThis.driver.executeScript(`window.scrollTo(${rect.x+rect.width}, ${rect.y+rect.height});`);
+        await myThis.driver.sleep(2000);
+        await elem.click();
+        await myThis.driver.sleep(2000);
     });
 });
 
diff --git a/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/hooks.js b/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/hooks.js
index f1f7254c4..3f077577e 100644
--- a/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/hooks.js
+++ b/accessibility-checker/boilerplates/cucumber-selenium/features/step_definitions/hooks.js
@@ -25,11 +25,11 @@ function getBrowserChrome() {
 
     const options = new chrome.Options();
     options.addArguments("--disable-dev-shm-usage");
-    options.addArguments("--headless");
+    options.addArguments("--headless=new");
     options.addArguments('--ignore-certificate-errors')
 
     let service = new chrome.ServiceBuilder(spath).build();
-    chrome.setDefaultService(service);
+    chrome.Driver.createSession(options, service);
 
     return new webdriver.Builder()
         .withCapabilities(webdriver.Capabilities.chrome())
@@ -59,7 +59,6 @@ const {BeforeAll, AfterAll, Before} = require("cucumber");
 
     BeforeAll(function() {
         driver = getBrowser();
-
         /*
         return new Promise(function(resolve, reject) {
             aChecker.onRunComplete(resolve);
diff --git a/accessibility-checker/boilerplates/cucumber-selenium/package.json b/accessibility-checker/boilerplates/cucumber-selenium/package.json
index 73bd68f08..a961aa082 100644
--- a/accessibility-checker/boilerplates/cucumber-selenium/package.json
+++ b/accessibility-checker/boilerplates/cucumber-selenium/package.json
@@ -12,7 +12,7 @@
     "eslint": "^7.0.0",
     "html-escape": "^2.0.0",
     "line-reader": "^0.4.0",
-    "selenium-webdriver": "4.3.0"
+    "selenium-webdriver": "4.9.2"
   },
   "dependencies": {}
 }
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/.gitignore b/accessibility-checker/boilerplates/jest-puppeteer-ts/.gitignore
new file mode 100644
index 000000000..872aa273a
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/.gitignore
@@ -0,0 +1 @@
+results
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/achecker.js b/accessibility-checker/boilerplates/jest-puppeteer-ts/achecker.js
new file mode 100644
index 000000000..e8d3a0aa0
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/achecker.js
@@ -0,0 +1,52 @@
+module.exports = {
+  // optional - Specify the rule archive
+  // Default: latest
+  // Run `npx aat archives` for a list of valid ruleArchive ids and policy ids
+  ruleArchive: 'latest',
+
+  // optional - Specify one or many policies to scan.
+  // Run `npx aat archives` for a list of valid ruleArchive ids and policy ids
+  policies: [ "IBM_Accessibility"],
+
+  // optional - Specify one or many violation levels on which to fail the test
+  //            i.e. If specified violation then the testcase will only fail if
+  //                 a violation is found during the scan.
+  // i.e. failLevels: ["violation"]
+  // i.e. failLevels: ["violation","potential violation"] or refer to below as a list
+  // Default: ["violation","potential violation"]
+  failLevels: [ "violation" ],
+
+  // optional - Specify one or many violation levels which should be reported
+  //            i.e. If specified violation then in the report it would only contain
+  //                 results which are level of violation.
+  // i.e. reportLevels: ["violation"]
+  // Valid values: violation, potentialviolation, recommendation, potentialrecommendation, manual
+  // Default: ["violation","potential violation"]
+  reportLevels: [
+      "violation",
+      "potentialviolation",
+      "recommendation",
+      "potentialrecommendation",
+      "manual"
+  ],
+
+  // Optional - Which type should the results be outputted to
+  // Valid values: json, csv
+  // Default: json
+  outputFormat: [ "json" ],
+
+  // Optional - Specify labels that you would like associated to your scan
+  //
+  // i.e.
+  //   label: ["Firefox","master","V12","Linux"]
+  // Default: N/A
+  label: [],
+
+  // optional - Where the scan results should be saved.
+  // Default: results
+  outputFolder: "results",
+
+  // optional - Where the baseline results should be loaded from
+  // Default: baselines
+  baselineFolder: "baselines",
+}
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/matchers/toBeAccessible.ts b/accessibility-checker/boilerplates/jest-puppeteer-ts/matchers/toBeAccessible.ts
new file mode 100644
index 000000000..7de930d08
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/matchers/toBeAccessible.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright IBM Corp. 2019
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+import { assertCompliance, getCompliance, stringifyResults } from "accessibility-checker";
+import { Page } from "puppeteer";
+
+async function toBeAccessible(node: Page) {
+  let results = await getCompliance(node, this.currentTestName.replace(/[ \\/]/g, "_"));
+  if (assertCompliance(results.report) === 0) {
+    return {
+      pass: true
+    }
+  } else {
+    return {
+      pass:false,
+      message: () => stringifyResults(results.report)
+    }
+  }
+}
+module.exports = toBeAccessible;
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/package.json b/accessibility-checker/boilerplates/jest-puppeteer-ts/package.json
new file mode 100644
index 000000000..04359fe8c
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "@ibma/eac-jest-boilerplate",
+  "version": "3.0.0",
+  "description": "Example usage of IBM Equal Access Checker with Jest, Puppeteer, and Typescript",
+  "scripts": {
+    "test": "jest test-ts/*.test.ts"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "jest": {
+    "preset": "ts-jest",
+    "setupFilesAfterEnv": [
+      "./setupAfterEnv.ts"
+    ],
+    "transformIgnorePatterns": [
+      "ace-node\\.js"
+    ]
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.5.0",
+    "@types/jest": "^29.5.1",
+    "accessibility-checker": "*",
+    "jest": "^29.5.0",
+    "puppeteer": "^22.14.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.1.5"
+  }
+}
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.html b/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.html
new file mode 100644
index 000000000..08e52b427
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html ng-app="helloApp" ng-controller="helloCtrl" lang='{{locale}}'>
+
+<head>
+    <title>Sample App</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.1.0/angular-material.min.css">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-animate.min.js"></script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-aria.min.js"></script>
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.0/angular-material.min.js"></script>
+    <script type="text/javascript" src="Hello.js"></script>
+</head>
+
+<body ng-cloak layout="column">
+    <md-toolbar layout="row" class="md-toolbar-tools" role="banner">
+        <h1>Sample App</h1>
+    </md-toolbar>
+
+    <div flex layout="row">
+
+        <md-sidenav md-is-locked-open="true" class="md-whiteframe-4dp" role="navigation">
+            Sidenav
+        </md-sidenav>
+
+        <md-content flex id="content" role="main">
+            <a id="clickMe" ng-click="showCard = !showCard">Click Me</a>
+            <md-card ng-if="showCard">
+                <md-card-content>
+                    <h2>Card headline</h2>
+                    <p>Card content</p>
+                    <img src="hello.png" />
+                </md-card-content>
+                <md-card-footer>
+                    Card footer
+                </md-card-footer>
+            </md-card>
+        </md-content>
+
+
+    </div>
+    <div>
+
+    </div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.js b/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.js
new file mode 100644
index 000000000..eb0208b24
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/sample/Hello.js
@@ -0,0 +1,10 @@
+var app = angular.module("helloApp", ["ngMaterial","ngAria"], function config($ariaProvider) {
+    $ariaProvider.config({
+        bindRoleForClick: false
+    });
+});
+
+app.controller("helloCtrl", function ($scope) {
+    $scope.locale = "en-US";
+    $scope.test = 1+2;
+});
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/setupAfterEnv.ts b/accessibility-checker/boilerplates/jest-puppeteer-ts/setupAfterEnv.ts
new file mode 100644
index 000000000..1f74ba914
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/setupAfterEnv.ts
@@ -0,0 +1,2 @@
+const toBeAccessible = require('./matchers/toBeAccessible');
+expect.extend({ toBeAccessible });
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/src/HelloWidget.js b/accessibility-checker/boilerplates/jest-puppeteer-ts/src/HelloWidget.js
new file mode 100644
index 000000000..c14dd8517
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/src/HelloWidget.js
@@ -0,0 +1,9 @@
+var React = require("react");
+
+var HelloWidget = React.createClass({
+    render: function () {
+        return "<div>Hello {this.props.name}</div>";
+    }
+});
+
+module.exports = HelloWidget;
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/test-ts/basic.test.ts b/accessibility-checker/boilerplates/jest-puppeteer-ts/test-ts/basic.test.ts
new file mode 100644
index 000000000..79adf7a58
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/test-ts/basic.test.ts
@@ -0,0 +1,61 @@
+'use strict';
+
+import {describe, expect, beforeAll, afterAll, test} from '@jest/globals';
+import { Browser, Page, launch } from 'puppeteer';
+
+let browser: Browser;
+beforeAll(async () => {
+    try {
+        browser = await launch({ headless: "shell"});
+    } catch (e) {
+        console.log(e);
+    }
+    return Promise.resolve();
+});
+
+afterAll(async() => {
+    await browser.close();
+    return Promise.resolve();
+});
+
+// Describe this Suite of testscases, describe is a test Suite and 'it' is a testcase.
+describe('Altoro Mutual', () => {
+    let page: Page;
+    beforeAll(async () => {
+        page = await browser.newPage();
+        await page.goto('http://altoromutual.com/');
+    });
+
+    afterAll(async () => {
+        return page.close();
+    });
+
+    test('should be titled "Altoro Mutual"', async () => {
+        await expect(page.title()).resolves.toMatch('Altoro Mutual');
+    });
+
+    test ('should be accessible', async() => {
+        await (expect(page) as any).toBeAccessible();
+    })
+
+    describe('"Personal" page', () => {
+        beforeAll(async () => {
+            await page.click("#LinkHeader2");
+        });
+        
+        test ('should be accessible', async() => {
+            await (expect(page) as any).toBeAccessible();
+        })
+    });
+
+    // describe('"Small Business" page', () => {
+    //     beforeAll(async () => {
+    //         await page.click("#LinkHeader3");
+    //     });
+        
+    //     it ('should be accessible', async() => {
+    //         await expect(page).toBeAccessible();
+    //     })
+    // });
+});
+
diff --git a/accessibility-checker/boilerplates/jest-puppeteer-ts/tsconfig.json b/accessibility-checker/boilerplates/jest-puppeteer-ts/tsconfig.json
new file mode 100644
index 000000000..47d450f62
--- /dev/null
+++ b/accessibility-checker/boilerplates/jest-puppeteer-ts/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "esModuleInterop": true,
+        "declaration": true,
+        "allowJs": true,
+        "target": "ES6",
+        "module": "es2022",
+        "removeComments": false,
+        "noEmitOnError": true,
+        "sourceMap": true,
+        "moduleResolution": "node",
+        "alwaysStrict": true,
+        "experimentalDecorators": true,
+        // "module": "commonjs",
+        "outDir": "test",
+        "emitDecoratorMetadata": true,
+        "lib": [
+            "dom",
+            "es7"
+        ]
+    },
+    "include": [
+        "test-ts/**/*.ts",
+        "test-ts/**/*.js"
+    ],
+    "exclude": [
+        "node_modules",
+        "coverage",
+        ".nyc_output"
+    ]
+}
\ No newline at end of file
diff --git a/accessibility-checker/boilerplates/jest-selenium/package.json b/accessibility-checker/boilerplates/jest-selenium/package.json
index ae4088b54..f1c286bca 100644
--- a/accessibility-checker/boilerplates/jest-selenium/package.json
+++ b/accessibility-checker/boilerplates/jest-selenium/package.json
@@ -11,6 +11,6 @@
     "chromedriver": "*",
     "install": "^0.10.1",
     "jest": "^26.0.1",
-    "selenium-webdriver": "4.3.0"
+    "selenium-webdriver": "4.9.2"
   }
 }
diff --git a/accessibility-checker/boilerplates/jest-selenium/test/basic.test.js b/accessibility-checker/boilerplates/jest-selenium/test/basic.test.js
index 173f61f01..ec0530e1e 100644
--- a/accessibility-checker/boilerplates/jest-selenium/test/basic.test.js
+++ b/accessibility-checker/boilerplates/jest-selenium/test/basic.test.js
@@ -19,11 +19,14 @@ beforeAll(function() {
         
         const options = new chrome.Options();
         options.addArguments("--disable-dev-shm-usage");
-        options.addArguments("--headless");
+        options.addArguments("--headless=new");
         options.addArguments('--ignore-certificate-errors')
 
         const service = new chrome.ServiceBuilder(spath).build();
-        chrome.setDefaultService(service);
+        // setDefaultService function is removed since web-driver v4.3.1+
+        //chrome.setDefaultService(service);
+        chrome.Driver.createSession(options, service);
+
         browser = new webdriver.Builder()
         .withCapabilities(webdriver.Capabilities.chrome())
         .setChromeOptions(options)
diff --git a/accessibility-checker/boilerplates/mocha-puppeteer-ts/package.json b/accessibility-checker/boilerplates/mocha-puppeteer-ts/package.json
index fb4bee55a..54dd408ef 100644
--- a/accessibility-checker/boilerplates/mocha-puppeteer-ts/package.json
+++ b/accessibility-checker/boilerplates/mocha-puppeteer-ts/package.json
@@ -2,6 +2,7 @@
   "name": "@ibma/ac-boilerplate-mocha-ts",
   "version": "3.0.0",
   "description": "Example usage of Accessibility Checker with Mocha and typescript",
+  "type": "module",
   "main": "src/app.js",
   "scripts": {
     "test": "tsc && mocha test/*.test.js"
@@ -13,7 +14,7 @@
     "accessibility-checker": "*",
     "chai": "^4.3.0",
     "mocha": "^8.3.0",
-    "puppeteer": "^13.4.0",
+    "puppeteer": "^22.14.0",
     "typescript": "^4.1.5"
   }
 }
diff --git a/accessibility-checker/boilerplates/mocha-puppeteer-ts/test-ts/basic.test.ts b/accessibility-checker/boilerplates/mocha-puppeteer-ts/test-ts/basic.test.ts
index c139d02ce..c20c25e65 100644
--- a/accessibility-checker/boilerplates/mocha-puppeteer-ts/test-ts/basic.test.ts
+++ b/accessibility-checker/boilerplates/mocha-puppeteer-ts/test-ts/basic.test.ts
@@ -6,13 +6,16 @@ import * as path from "path";
 import { expect } from "chai";
 import { before, after, describe, it } from "mocha";
 import { ICheckerReport } from "accessibility-checker/lib/api/IChecker";
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
 let browser: Puppeteer.Browser;
 let page: Puppeteer.Page;
 
 before(async () => {
     try {
-        browser = await Puppeteer.launch();
+        browser = await Puppeteer.launch({ headless: "shell"});
         page = await browser.newPage();
     } catch (e) {
         console.log(e);
diff --git a/accessibility-checker/boilerplates/mocha-puppeteer-ts/tsconfig.json b/accessibility-checker/boilerplates/mocha-puppeteer-ts/tsconfig.json
index d0cdf618b..acf08f21d 100644
--- a/accessibility-checker/boilerplates/mocha-puppeteer-ts/tsconfig.json
+++ b/accessibility-checker/boilerplates/mocha-puppeteer-ts/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "declaration": true,
         "allowJs": true,
-        "target": "ES5",
+        "target": "ES6",
+        "module": "es2022",
         "removeComments": false,
         "noEmitOnError": true,
         "sourceMap": true,
diff --git a/accessibility-checker/boilerplates/mocha-selenium/package.json b/accessibility-checker/boilerplates/mocha-selenium/package.json
index 74e15941a..1c043d77f 100644
--- a/accessibility-checker/boilerplates/mocha-selenium/package.json
+++ b/accessibility-checker/boilerplates/mocha-selenium/package.json
@@ -14,6 +14,6 @@
     "chai": "^3.5.0",
     "chromedriver": "*",
     "mocha": "^3.0.2",
-    "selenium-webdriver": "4.3.0"
+    "selenium-webdriver": "4.9.2"
   }
 }
diff --git a/accessibility-checker/boilerplates/mocha-selenium/test/basic.test.js b/accessibility-checker/boilerplates/mocha-selenium/test/basic.test.js
index 12b593f22..c772eb4b5 100644
--- a/accessibility-checker/boilerplates/mocha-selenium/test/basic.test.js
+++ b/accessibility-checker/boilerplates/mocha-selenium/test/basic.test.js
@@ -25,8 +25,10 @@ before(function(done) {
         options.addArguments("--headless");
         options.addArguments('--ignore-certificate-errors')
 
-        const service = new chrome.ServiceBuilder(spath).build();
-        chrome.setDefaultService(service);
+        // setDefaultService function is removed since web-driver v4.3.1+
+        //chrome.setDefaultService(service);
+        chrome.Driver.createSession(options, service);
+
         browser = new webdriver.Builder()
         .withCapabilities(webdriver.Capabilities.chrome())
         .setChromeOptions(options)
diff --git a/accessibility-checker/gulp/gulpfile.js b/accessibility-checker/gulp/gulpfile.mjs
similarity index 79%
rename from accessibility-checker/gulp/gulpfile.js
rename to accessibility-checker/gulp/gulpfile.mjs
index 1049b6ba0..5aa1de0a6 100644
--- a/accessibility-checker/gulp/gulpfile.js
+++ b/accessibility-checker/gulp/gulpfile.mjs
@@ -31,15 +31,17 @@ function notice(years) {
         " *****************************************************************************/\n";
 }
 
-const gulp = require("gulp"),
-    ginsert = require("gulp-insert"),
-    greplace = require("gulp-replace"),
-    terser = require("gulp-terser");
+import gulp from "gulp";
+import ginsert from "gulp-insert";
+import greplace from "gulp-replace";
+import terser from "gulp-terser";
 
 gulp.task("build-uglify", function () {
-    return gulp.src(["../src/**/lib/**/*.js", "../src/index.js", "!../src/node_modules/**"])
-        .pipe(terser())
-        .pipe(greplace('if(void 0===globalThis.ace_ibma)', "if('undefined' === typeof(globalThis.ace_ibma))"))
+    return gulp.src(["../src/**/lib/**/*.js", "../src/*/index.js", "!../src/node_modules/**"])
+        .pipe(terser({compress:{typeofs: false}}))
+        // .pipe(greplace('if(void 0===globalThis.ace_ibma)', "if('undefined' === typeof(globalThis.ace_ibma))"))
+        // .pipe(greplace('void 0===ace', "'undefined'===typeof ace"))
+        // .pipe(greplace('void 0!==ace', "'undefined'!==typeof ace"))
         .pipe(ginsert.prepend(notice("2016,2017,2018,2019")))
         .pipe(gulp.dest("../package"));
 
@@ -48,6 +50,7 @@ gulp.task("build-uglify", function () {
 gulp.task("build-copy", function () {
     return gulp.src([
         "../src/**/bin/achecker.js",
+        "../src/mjs/index.d.ts",
         "../src/package.json",
         "../src/README.md",
     ])
diff --git a/accessibility-checker/package.json b/accessibility-checker/package.json
index 94f01499b..b947fbafc 100644
--- a/accessibility-checker/package.json
+++ b/accessibility-checker/package.json
@@ -8,26 +8,25 @@
     "lint": "eslint src",
     "test": "mocha -R dot test/mocha/**/*.test.js test/a11y-rule-test-able/*.test.js",
     "build": "npm run build:common && npm run build:ts && cd ../accessibility-checker-engine && npm install && npm run build && npm run build-debug && npm run build-node && npm run build-node-debug",
-    "build:ts": "npx tsc",
+    "build:ts": "npx tsc -p tsconfig-cjs.json && sed -i'.old' 's/\\/\\/ const __filename/const __filename/g; s/\\/\\/ import { fileURLToPath }/import { fileURLToPath }/g' ./src-ts/lib/common/config/ACConfigManager.ts && npx tsc -p tsconfig.json && sed -i'.old' 's/const __filename/\\/\\/ const __filename/g; s/import { fileURLToPath }/\\/\\/ import { fileURLToPath }/g' ./src-ts/lib/common/config/ACConfigManager.ts && rm ./src-ts/lib/common/config/ACConfigManager.ts.old && shx cp ./src-ts/conf/package-cjs.json ./src/cjs/package.json && shx cp ./src-ts/conf/package-mjs.json ./src/mjs/package.json && sed -i'.old' 's/\\/\\/ import { createRequire }/import { createRequire }/g; s/\\/\\/ const require/const require/g' ./src/mjs/lib/ACEngineManager.js && rm ./src/mjs/lib/ACEngineManager.js.old",
     "build:report": "(cd ../report-react && npm run build && cd ../accessibility-checker && shx cp ../report-react/build/genReport.tsx ./src-ts/lib/common/report/genReport.ts)",
     "build:common": "shx rm -rf ./src-ts/lib/common && shx cp -R ../common/module/src ./src-ts/lib/common && npm run build:report",
-    "package:zip": "shx rm -rf package && gulp --gulpfile gulp/gulpfile.js && shx chmod u+x package/bin/*.js && cd package && npm pack",
-    "package:npm": "shx rm -rf package && gulp --gulpfile gulp/gulpfile.js && shx chmod u+x package/bin/*.js"
+    "package:zip": "shx rm -rf package && gulp --gulpfile gulp/gulpfile.mjs && shx chmod u+x package/bin/*.js && cd package && npm pack",
+    "package:npm": "shx rm -rf package && gulp --gulpfile gulp/gulpfile.mjs && shx chmod u+x package/bin/*.js"
   },
   "repository": {
     "type": "git",
     "url": "git@github.com/IBMa/equal-access/accessibility-checker"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "dependencies": {
-    "axios": "^1.4.0",
     "chromedriver": "*",
     "deep-diff": "^1.0.2",
     "exceljs": "^4.3.0",
     "js-yaml": "^4.1.0",
-    "puppeteer": "^13.0.0"
+    "puppeteer": "^22.14.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.21.1",
@@ -58,14 +57,16 @@
     "natives": "1.1.6",
     "playwright": "^1.21.1",
     "rimraf": "^3.0.2",
-    "selenium-webdriver": "4.3.0",
+    "selenium-webdriver": "4.9.2",
     "serve-index": "^1.9.1",
     "shx": "^0.3.4",
     "tmp": "0.2.1",
     "typescript": "^5.1.3",
     "url-exists": "^1.0.3",
     "ws": "^8.3.0",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.4.23",
+    "ts-node": "^10.9.2"
+
   },
   "publishConfig": {
     "access": "public"
diff --git a/accessibility-checker/src-ts/bin/achecker.js b/accessibility-checker/src-ts/bin/achecker.js
index 1b1bc2f29..3ec8e7c33 100755
--- a/accessibility-checker/src-ts/bin/achecker.js
+++ b/accessibility-checker/src-ts/bin/achecker.js
@@ -15,11 +15,11 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   *****************************************************************************/
- 
-const aChecker = require("../index.js")
-const fs = require('fs');
-const readline = require('readline');
-const path = require("path");
+
+import * as aChecker from "../index.js";
+import * as fs from "fs";
+import * as readline from "readline";
+import * as path from "path";
 
 let validCLParams = [
     "inputFile"
diff --git a/accessibility-checker/src-ts/conf/package-cjs.json b/accessibility-checker/src-ts/conf/package-cjs.json
new file mode 100644
index 000000000..3ccce550c
--- /dev/null
+++ b/accessibility-checker/src-ts/conf/package-cjs.json
@@ -0,0 +1,3 @@
+{
+    "type":"commonjs"
+}
\ No newline at end of file
diff --git a/accessibility-checker/src-ts/conf/package-mjs.json b/accessibility-checker/src-ts/conf/package-mjs.json
new file mode 100644
index 000000000..96ae6e57e
--- /dev/null
+++ b/accessibility-checker/src-ts/conf/package-mjs.json
@@ -0,0 +1,3 @@
+{
+    "type": "module"
+}
\ No newline at end of file
diff --git a/accessibility-checker/src-ts/lib/ACBrowserManager.ts b/accessibility-checker/src-ts/lib/ACBrowserManager.ts
index fe8c4c8d2..b5f0e46bc 100644
--- a/accessibility-checker/src-ts/lib/ACBrowserManager.ts
+++ b/accessibility-checker/src-ts/lib/ACBrowserManager.ts
@@ -1,6 +1,6 @@
 import * as puppeteer from "puppeteer";
-import { ACConfigManager } from "./common/config/ACConfigManager";
-import { IConfigInternal } from "./common/config/IConfig";
+import { ACConfigManager } from "./common/config/ACConfigManager.js";
+import { IConfigInternal } from "./common/config/IConfig.js";
 
 
 export class ACBrowserManager {
diff --git a/accessibility-checker/src-ts/lib/ACEngineManager.ts b/accessibility-checker/src-ts/lib/ACEngineManager.ts
index 6829625f5..db9fdc16b 100644
--- a/accessibility-checker/src-ts/lib/ACEngineManager.ts
+++ b/accessibility-checker/src-ts/lib/ACEngineManager.ts
@@ -4,6 +4,10 @@ import { ACConfigManager } from "./common/config/ACConfigManager";
 import { fetch_get_text } from "./common/api-ext/Fetch";
 import { IChecker } from "./common/engine/IChecker";
 
+// The following two lines will be modified by sed for cjs vs mjs environments. Look at package.json before modifying
+// import { createRequire } from "module"; 
+// const require = createRequire(import.meta.url);
+
 let ace;
 
 let checker: IChecker;
@@ -73,7 +77,7 @@ export class ACEngineManager {
                             return new Promise<void>((resolve, reject) => {
                                 eval(engineContent);
                                 globalThis.ace_ibma = ace;
-                                if ('undefined' !== typeof(ace)) {
+                                if ('undefined' !== typeof ace) {
                                     ace = ace_backup_in_ibma;
                                 }
                                 resolve();
@@ -137,7 +141,7 @@ export class ACEngineManager {
         if ('undefined' === typeof (ace) || ace === null) {
             eval(${JSON.stringify(ACEngineManager.engineContent)})
             globalThis.ace_ibma = ace;
-            if ('undefined' !== typeof(ace)) {
+            if ('undefined' !== typeof ace) {
                 ace = ace_backup_in_ibma;
             } 
             cb();
@@ -164,9 +168,11 @@ export class ACEngineManager {
                     return ACEngineManager.loadEngineLocal();
                 }).catch(function (err) {
                     console.log(err);
+                    return Promise.reject(err);
                 });
             } catch (e) {
                 console.log(e);
+                return Promise.reject(e);
             }
         } else if (ACEngineManager.isWebDriverIO(content)) {
 
@@ -271,7 +277,7 @@ export class ACEngineManager {
                     checker = new ace_ibma.Checker();
                     return resolve();
                 } else {
-                    fs.writeFile(nodePath + ".js", data, function (err) {
+                    fs.writeFile(nodePath + ".js", data, async function (err) {
                         if (err) {
                             console.log(err);
                             reject(err);
diff --git a/accessibility-checker/src-ts/lib/ACHelper.ts b/accessibility-checker/src-ts/lib/ACHelper.ts
index ab1cd9ce3..08dbeebd2 100644
--- a/accessibility-checker/src-ts/lib/ACHelper.ts
+++ b/accessibility-checker/src-ts/lib/ACHelper.ts
@@ -1,14 +1,14 @@
-import { ICheckerReport, ICheckerResult } from "./api/IChecker";
-import { ACBrowserManager } from "./ACBrowserManager";
-import { ACEngineManager } from "./ACEngineManager";
-import { ACConfigManager } from "./common/config/ACConfigManager";
-import { IConfigInternal } from "./common/config/IConfig";
-import { ReporterManager } from "./common/report/ReporterManager";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { IAbstractAPI } from "./common/api-ext/IAbstractAPI";
-import { IBaselineReport, IEngineReport } from "./common/engine/IReport";
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
 import { dirname, join, resolve as pathResolve } from "path";
-import { BaselineManager, RefactorMap } from "./common/report/BaselineManager";
+import { ICheckerReport, ICheckerResult } from "./api/IChecker.js";
+import { ACBrowserManager } from "./ACBrowserManager.js";
+import { ACEngineManager } from "./ACEngineManager.js";
+import { ACConfigManager } from "./common/config/ACConfigManager.js";
+import { IConfigInternal } from "./common/config/IConfig.js";
+import { ReporterManager } from "./common/report/ReporterManager.js";
+import { IAbstractAPI } from "./common/api-ext/IAbstractAPI.js";
+import { IBaselineReport, IEngineReport } from "./common/engine/IReport.js";
+import { BaselineManager, RefactorMap } from "./common/report/BaselineManager.js";
 
 declare var after;
 
@@ -46,7 +46,11 @@ class MyFS implements IAbstractAPI {
     loadBaseline(label) {
         let baselineFile = join(join(process.cwd(), Config.baselineFolder), label+".json");
         if (!existsSync(baselineFile)) return null;
-        return require(baselineFile);
+        if (typeof require !== "undefined") {
+            return require(baselineFile);
+        } else {
+            return JSON.parse(readFileSync(baselineFile).toString());
+        }
     }
     getChecker() {
         return ACEngineManager.getChecker();
@@ -71,42 +75,47 @@ async function initialize() {
     BaselineManager.initialize(Config, absAPI, refactorMap);
 }
 
-try {
-    // If cucumber is the platform...
-    let {AfterAll} = require('cucumber');
-    AfterAll(function (done) {
-        // const rulePack = `${Config.rulePack}`;
-        initialize()
-            .then(() => ReporterManager.generateSummaries())
-            .then(() => ACBrowserManager.close())
-            .then(done);
-    });
-} catch (e) {
-    if (typeof (after) !== "undefined") {
-        after(function (done) {
-            if (Config) {
-                if (this.timeout) {
-                    this.timeout(300000);
-                }
-                // const rulePack = `${Config.rulePack}/ace`;
+(async () => {
+    try {
+        // If cucumber is the platform...
+        let module = (await import("cucumber"!));
+        let {AfterAll} = require('cucumber');
+        if (module.default.AfterAll) {
+            module.default.AfterAll(function (done) {
+                // const rulePack = `${Config.rulePack}`;
                 initialize()
                     .then(() => ReporterManager.generateSummaries())
                     .then(() => ACBrowserManager.close())
                     .then(done);
-            } else {
-                done && done();
-            }
-        });
-    } else {
-        process.on('beforeExit', async function () {
-            if (Config) {
-                initialize()
-                    .then(() => ReporterManager.generateSummaries())
-                ACBrowserManager.close();
-            }
-        });
+            });
+        }
+    } catch (e) {
+        if (typeof (after) !== "undefined") {
+            after(function (done) {
+                if (Config) {
+                    if (this.timeout) {
+                        this.timeout(300000);
+                    }
+                    // const rulePack = `${Config.rulePack}/ace`;
+                    initialize()
+                        .then(() => ReporterManager.generateSummaries())
+                        .then(() => ACBrowserManager.close())
+                        .then(done);
+                } else {
+                    done();
+                }
+            });
+        } else {
+            process.on('beforeExit', async function () {
+                if (Config) {
+                    initialize()
+                        .then(() => ReporterManager.generateSummaries())
+                    ACBrowserManager.close();
+                }
+            });
+        }
     }
-}
+})();
 
 function areValidPolicy(valPolicies, curPol) {
     let isValPol = false;
@@ -136,7 +145,8 @@ export async function getComplianceHelper(content, label) : Promise<ICheckerResu
     Config.DEBUG && console.log("START 'aChecker.getCompliance' function");
     if (!content) {
         console.error("aChecker: Unable to get compliance of null or undefined object")
-        return null;
+        //return null;
+        throw new Error("aChecker: Unable to get compliance of null or undefined object");
     }
 
     // Variable Decleration
@@ -192,7 +202,10 @@ export async function getComplianceHelper(content, label) : Promise<ICheckerResu
     }
 
     let parsed = await getParsed(content);
-    if (parsed === null) return null;
+    if (!parsed) {
+        console.error("Invalid content: " + content);
+        throw new Error("Invalid content: " + content);
+    }
     await ACEngineManager.loadEngine(parsed);
 
     // Get the Data when the scan is started
@@ -275,6 +288,7 @@ cb(e);
             }
             finalReport = ReporterManager.addEngineReport("Selenium", startScan, url, title, label, origReport);
         }
+        
         return {
             "report": finalReport,
             "webdriver": parsed
@@ -385,6 +399,7 @@ async function getComplianceHelperPuppeteer(label, parsed, curPol) : Promise<ICh
             }
             finalReport = ReporterManager.addEngineReport("Puppeteer", startScan, url, title, label, origReport);
         }
+        
         page.aceBusy = false;
 
         return {
diff --git a/accessibility-checker/src-ts/lib/api/IChecker.ts b/accessibility-checker/src-ts/lib/api/IChecker.ts
index f3759d40d..20988eaeb 100644
--- a/accessibility-checker/src-ts/lib/api/IChecker.ts
+++ b/accessibility-checker/src-ts/lib/api/IChecker.ts
@@ -1,5 +1,5 @@
-import { eRuleLevel } from "../common/config/IConfig";
-import { IBaselineReport } from "../common/engine/IReport";
+import { eRuleLevel } from "../common/config/IConfig.js";
+import { IBaselineReport } from "../common/engine/IReport.js";
 
 export enum eAssertResult {
     ERROR = -1,
diff --git a/accessibility-checker/src/bin/achecker.js b/accessibility-checker/src/bin/achecker.js
new file mode 100644
index 000000000..9626ae8bc
--- /dev/null
+++ b/accessibility-checker/src/bin/achecker.js
@@ -0,0 +1,228 @@
+#!/usr/bin/env node
+/******************************************************************************
+     Copyright:: 2020- IBM, Inc
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+  *****************************************************************************/
+    import * as aChecker from "../mjs/index.js";
+    import * as fs from "fs";
+    import * as readline from "readline";
+    import * as path from "path";
+    let validCLParams = [
+        "inputFile"
+    ];
+    let splitCLParams = [
+        "policies",
+        "failLevels",
+        "reportLevels",
+        "outputFormat",
+        "label"
+    ];
+    function processCommandLine(ACConfig) {
+        const [, , ...args] = process.argv;
+        let lastArg = null;
+        let lastFlag = null;
+        for (let arg of args) {
+            if (arg.match(/^--.*$/)) {
+                lastFlag = arg.substring(2);
+                lastArg = null;
+            }
+            else if (lastFlag) {
+                if (lastFlag in ACConfig || validCLParams.includes(lastFlag)) {
+                    if (splitCLParams.includes(lastFlag)) {
+                        arg = arg.split(",");
+                    }
+                    ACConfig[lastFlag] = arg;
+                }
+                lastFlag = lastArg = null;
+            }
+            else {
+                lastArg = arg;
+            }
+        }
+        if (lastArg) {
+            ACConfig.inputFile = lastArg;
+        }
+    }
+    async function getFiles(dir) {
+        let retVal = [];
+        for (let f of fs.readdirSync(dir)) {
+            if (f[0] === ".") {
+                // skip
+            }
+            else {
+                f = path.join(dir, f);
+                if (fs.lstatSync(f).isDirectory()) {
+                    retVal = retVal.concat(await getFiles(f));
+                }
+                else if (f.endsWith(".htm") || f.endsWith(".html")) {
+                    retVal.push(f);
+                }
+            }
+        }
+        return retVal;
+    }
+    async function showHelp(config) {
+        let lastArg = config.inputFile;
+        if (!lastArg || lastArg === "help") {
+            console.log(`Usage: achecker [flags] [command / file / directory / URL]
+    
+    Commands:
+        archives                : Display valid archive ids and policy ids
+    
+    Flags:
+        Flags can be set via .achecker.yml or aceconfig.js files. Specifying the flags here
+        will override those options.
+    
+        --ruleArchive           : Archive id to use. Run "achecker archives" for valid ids
+        --policies              : Comma separated list of policies. Run "achecker archives"
+                                    for valid ids
+        --failLevels            : Comma separated list of levels that will indicate
+                                    a failure. Valid values: violation,
+                                    potentialviolation, recommendation,
+                                    potentialrecommendation, manual
+        --reportLevels          : Comma separated list of levels that will be included
+                                    in reports. Valid values: violation,
+                                    potentialviolation, recommendation,
+                                    potentialrecommendation, manual, pass
+        --outputFormat          : Comma separated list of output report formats.
+                                    Valid values: json, csv, xlsx, or html
+        --label                 : Comma separated list of labels to include in reports
+        --outputFolder          : Folder to output results and reports
+        --baselineFolder        : Folder that includes baseline files
+    `);
+            process.exit(-1);
+        }
+        else if (lastArg === "archives") {
+            let archiveInfo = {
+                "latest": []
+            };
+            console.log();
+            console.log("Archive [Archive Id]");
+            console.log("  - Policy [Policy Id]:");
+            console.log("-----------------------");
+            console.log();
+            for (const archive of config.ruleArchiveSet) {
+                if (archive.sunset)
+                    continue;
+                console.log(`${archive.name} [${archive.id}]`);
+                for (const policy of archive.policies) {
+                    console.log(`  - ${policy.name} [${policy.id}]`);
+                }
+                archiveInfo[archive.id] = archive.policies;
+                if (archive.latest) {
+                    archiveInfo['latest'] = archiveInfo[archive.id];
+                }
+            }
+            process.exit(-1);
+        }
+    }
+    async function getInputFileList() {
+        let config = await aChecker.getConfig();
+        processCommandLine(config);
+        await showHelp(config);
+        let inputs = [];
+        let filename = config.inputFile.trim();
+        if (filename.endsWith(".txt")) {
+            const fileStream = fs.createReadStream(filename);
+            const rl = readline.createInterface({
+                input: fileStream,
+                crlfDelay: Infinity
+            });
+            // Note: we use the crlfDelay option to recognize all instances of CR LF
+            // ('\r\n') in input.txt as a single line break.
+            for await (const line of rl) {
+                if (line.trim().length === 0) {
+                }
+                else if (line.startsWith(path.sep)) {
+                    inputs.push(line);
+                }
+                else if (line.match(/[a-z]{4,5}:\/\//)) {
+                    inputs.push(line);
+                }
+                else {
+                    inputs.push(path.join(path.dirname(filename), line));
+                }
+            }
+        }
+        else {
+            inputs = [filename];
+        }
+        let retVal = [];
+        for (const input of inputs) {
+            let isDirectory = false;
+            try {
+                isDirectory = fs.lstatSync(input).isDirectory();
+            }
+            catch (e) { }
+            if (isDirectory) {
+                retVal = retVal.concat(await getFiles(input));
+            }
+            else {
+                retVal.push(input);
+            }
+        }
+        return retVal;
+    }
+    // Prepare the configuration
+    getInputFileList().then(async (rptInputFiles) => {
+        let idx = 0;
+        let failures = [];
+        let errors = 0;
+        for (let f of rptInputFiles) {
+            let result;
+            let isFile = false;
+            try {
+                isFile = fs.lstatSync(f).isFile();
+                f = path.resolve(f);
+            }
+            catch (e) { }
+            if (isFile) {
+                result = await aChecker.getCompliance("file://" + f, f.replace(/^file:\/\//, "").replace(/[:?&=]/g, "_"));
+            }
+            else {
+                result = await aChecker.getCompliance(f, f.replace(/^(https?:|file:)\/\//, "").replace(/[:?&=]/g, "_"));
+            }
+            if (result) {
+                if (aChecker.assertCompliance(result.report) === 0) {
+                    console.log("Passed:", f);
+                }
+                else {
+                    failures.push({
+                        file: f,
+                        report: result.report
+                    });
+                    console.log("Failed:", f);
+                }
+            }
+            else {
+                ++errors;
+                console.log("Error:", f);
+            }
+        }
+        if (failures.length > 0) {
+            console.log();
+            console.log("Failing scan details:");
+            console.log();
+            for (const fail of failures) {
+                console.log(aChecker.stringifyResults(fail.report));
+            }
+        }
+        console.log();
+        console.log(`${rptInputFiles.length - failures.length - errors} of ${rptInputFiles.length} passed.`);
+        await aChecker.close();
+        if (failures.length !== 0 || errors !== 0) {
+            process.exitCode = 1;
+        }
+    });
+    //# sourceMappingURL=achecker.js.map
\ No newline at end of file
diff --git a/accessibility-checker/src/cjs/package.json b/accessibility-checker/src/cjs/package.json
new file mode 100644
index 000000000..6a0d2ef2a
--- /dev/null
+++ b/accessibility-checker/src/cjs/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}
\ No newline at end of file
diff --git a/accessibility-checker/src/mjs/lib/.gitignore b/accessibility-checker/src/mjs/lib/.gitignore
new file mode 100644
index 000000000..45a160d12
--- /dev/null
+++ b/accessibility-checker/src/mjs/lib/.gitignore
@@ -0,0 +1 @@
+engine
diff --git a/accessibility-checker/src/mjs/package.json b/accessibility-checker/src/mjs/package.json
new file mode 100644
index 000000000..96ae6e57e
--- /dev/null
+++ b/accessibility-checker/src/mjs/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "module"
+}
\ No newline at end of file
diff --git a/accessibility-checker/src/package.json b/accessibility-checker/src/package.json
index ece78db3b..7e5044122 100644
--- a/accessibility-checker/src/package.json
+++ b/accessibility-checker/src/package.json
@@ -2,7 +2,14 @@
   "name": "accessibility-checker",
   "version": "3.0.0",
   "description": "An automated testing tools for accessibility testing using Puppeteer, Selenium, or Zombie",
-  "main": "index.js",
+  "main": "cjs/index.js",
+  "module": "mjs/index.js",
+  "exports": {
+    ".": {
+        "import": "./mjs/index.js",
+        "require": "./cjs/index.js"
+    }
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -18,12 +25,11 @@
   "author": "IBM Accessibility",
   "license": "Apache-2.0",
   "dependencies": {
-    "axios": "^1.4.0",
     "chromedriver": "*",
     "deep-diff": "^1.0.2",
     "exceljs": "^4.3.0",
     "js-yaml": "^4.1.0",
-    "puppeteer": "^13.0.0",
+    "puppeteer": "^22.14.0",
     "string-hash": "^1.1.3"
   },
   "repository": {
diff --git a/accessibility-checker/test-act-w3/act.js b/accessibility-checker/test-act-w3/act.mjs
similarity index 89%
rename from accessibility-checker/test-act-w3/act.js
rename to accessibility-checker/test-act-w3/act.mjs
index feb236f8a..b304c670b 100644
--- a/accessibility-checker/test-act-w3/act.js
+++ b/accessibility-checker/test-act-w3/act.mjs
@@ -7,8 +7,7 @@
 
 'use strict';
 
-const aChecker = require("../src/index");
-const request = require("request");
+import * as aChecker from "../src/mjs/index.js";
 const rulesetP = aChecker.getRuleset('IBM_Accessibility');
 
 async function getAceMapping() {
@@ -59,25 +58,22 @@ async function getAceMapping() {
     return retVal;
 }
 
-async function getTestcases() {
+export async function getTestcases() {
     let aceMapping = await getAceMapping();
     let ruleTestInfo = {}
-    return await new Promise((resolve, reject) => {
-        request("https://www.w3.org/WAI/content-assets/wcag-act-rules/testcases.json", (err, req, body) => {
-            let testcaseInfo = JSON.parse(body);
-            for (const testcase of testcaseInfo.testcases) {
-                // if (testcase.ruleId in aceMapping) {
-                    ruleTestInfo[testcase.ruleId] = ruleTestInfo[testcase.ruleId] || {
-                        aceRules: aceMapping[testcase.ruleId],
-                        label: testcase.ruleName,
-                        testcases: []
-                    }
-                    ruleTestInfo[testcase.ruleId].testcases.push(testcase);
-                // }
+    let resp = await fetch("https://www.w3.org/WAI/content-assets/wcag-act-rules/testcases.json");
+    let testcaseInfo = await resp.json();
+    for (const testcase of testcaseInfo.testcases) {
+        // if (testcase.ruleId in aceMapping) {
+            ruleTestInfo[testcase.ruleId] = ruleTestInfo[testcase.ruleId] || {
+                aceRules: aceMapping[testcase.ruleId],
+                label: testcase.ruleName,
+                testcases: []
             }
-            resolve(ruleTestInfo);
-        });
-    });
+            ruleTestInfo[testcase.ruleId].testcases.push(testcase);
+        // }
+    }
+    return ruleTestInfo;
 }
 
 async function getAssertion(ruleId, aceRules, result) {
@@ -111,7 +107,7 @@ async function getAssertion(ruleId, aceRules, result) {
     }
 }
 
-async function getResult(page, actRuleId, testcaseId, aceRules, bSkip) {
+export async function getResult(page, actRuleId, testcaseId, aceRules, bSkip) {
     const ruleset = await rulesetP;
     let assertions = [];
     if (aceRules.length === 0) {
@@ -230,5 +226,3 @@ async function getResult(page, actRuleId, testcaseId, aceRules, bSkip) {
         issuesAll: bSkip ? [] : results.report.results
     }
 }
-
-module.exports = { getTestcases, getResult }
\ No newline at end of file
diff --git a/accessibility-checker/test-act-w3/main.js b/accessibility-checker/test-act-w3/main.mjs
similarity index 92%
rename from accessibility-checker/test-act-w3/main.js
rename to accessibility-checker/test-act-w3/main.mjs
index 81f974cbc..896806e1e 100644
--- a/accessibility-checker/test-act-w3/main.js
+++ b/accessibility-checker/test-act-w3/main.mjs
@@ -1,8 +1,8 @@
 'use strict';
 
-const puppeteer = require('puppeteer');
-const { getTestcases, getResult } = require("./act");
-const fs = require("fs");
+import * as puppeteer from "puppeteer";
+import { getTestcases, getResult } from "./act.mjs";
+import * as fs from "fs";
 (async () => {
     // Fetch the testcases from ACT
     let ruleTestInfo = await getTestcases();
@@ -12,7 +12,7 @@ const fs = require("fs");
     }
     
     // Setup the Puppeteer test environment
-    let browser = await puppeteer.launch({ headless: true, ignoreHTTPSErrors: true });
+    let browser = await puppeteer.launch({ headless: 'shell', ignoreHTTPSErrors: true });
     let pupPage = await browser.newPage();
     await pupPage.setRequestInterception(true);
     pupPage.on('request', request => {
@@ -63,12 +63,14 @@ const fs = require("fs");
                         while (!succeeded) {
                             try {
                                 await pupPage.goto(testcase.url, { waitUntil: 'domcontentloaded' });
-                                await pupPage._client.send("Page.stopLoading");
+                                const client = await pupPage.target().createCDPSession();
+                                await client.send("Page.stopLoading");
                                 let win = await pupPage.evaluate("document");
                                 if (win) {
                                     succeeded = true;
                                 }
                             } catch (err) {
+                                console.log(err);
                             }
                         }
                     } else {
diff --git a/accessibility-checker/test-act-w3/package.json b/accessibility-checker/test-act-w3/package.json
index 9ee7ce012..7e55ed004 100644
--- a/accessibility-checker/test-act-w3/package.json
+++ b/accessibility-checker/test-act-w3/package.json
@@ -2,7 +2,8 @@
   "name": "test-act",
   "version": "1.0.0",
   "description": "Run ACT testcases",
+  "type": "module",
   "scripts": {
-    "test": "echo \"Results output to act-report-v2.txt\" && node main.js > act-report-v2.txt"
+    "test": "echo \"Results output to act-report-v2.txt\" && node --experimental-specifier-resolution=node main.mjs > act-report-v2.txt"
   }
 }
diff --git a/accessibility-checker/test-act/act.js b/accessibility-checker/test-act/act.mjs
similarity index 84%
rename from accessibility-checker/test-act/act.js
rename to accessibility-checker/test-act/act.mjs
index 74e50bc79..63c3c3097 100644
--- a/accessibility-checker/test-act/act.js
+++ b/accessibility-checker/test-act/act.mjs
@@ -7,8 +7,7 @@
 
 'use strict';
 
-const aChecker = require("../src/index");
-const request = require("request");
+import * as aChecker from "../src/mjs/index.js";
  
 async function getAceMapping() {
     let rules = await aChecker.getRules();
@@ -58,28 +57,25 @@ async function getAceMapping() {
     return retVal;
 }
 
-async function getTestcases() {
+export async function getTestcases() {
     let aceMapping = await getAceMapping();
     let ruleTestInfo = {}
-    return await new Promise((resolve, reject) => {
-        request("https://act-rules.github.io/testcases.json", (err, req, body) => {
-            let testcaseInfo = JSON.parse(body);
-            for (const testcase of testcaseInfo.testcases) {
-                if (testcase.ruleId in aceMapping) {
-                    ruleTestInfo[testcase.ruleId] = ruleTestInfo[testcase.ruleId] || {
-                        aceRules: aceMapping[testcase.ruleId],
-                        label: testcase.ruleName,
-                        testcases: []
-                    }
-                    ruleTestInfo[testcase.ruleId].testcases.push(testcase);
-                }
+    let resp = await fetch("https://act-rules.github.io/testcases.json");
+    let testcaseInfo = await resp.json();
+    for (const testcase of testcaseInfo.testcases) {
+        if (testcase.ruleId in aceMapping) {
+            ruleTestInfo[testcase.ruleId] = ruleTestInfo[testcase.ruleId] || {
+                aceRules: aceMapping[testcase.ruleId],
+                label: testcase.ruleName,
+                testcases: []
             }
-            resolve(ruleTestInfo);
-        });
-    });
+            ruleTestInfo[testcase.ruleId].testcases.push(testcase);
+        }
+    }
+    return ruleTestInfo;
 }
 
-async function getResult(page, testcaseId, aceRules, bSkip) {
+export async function getResult(page, testcaseId, aceRules, bSkip) {
     if (aceRules.length === 0) {
         return {
             title: "",
@@ -155,5 +151,3 @@ async function getResult(page, testcaseId, aceRules, bSkip) {
         issuesAll: issues2
     }
 }
-
-module.exports = { getTestcases, getResult }
\ No newline at end of file
diff --git a/accessibility-checker/test-act/main.js b/accessibility-checker/test-act/main.mjs
similarity index 95%
rename from accessibility-checker/test-act/main.js
rename to accessibility-checker/test-act/main.mjs
index e822ffaad..2a06bfc18 100644
--- a/accessibility-checker/test-act/main.js
+++ b/accessibility-checker/test-act/main.mjs
@@ -1,15 +1,15 @@
 'use strict';
 
-const puppeteer = require('puppeteer');
-const { getTestcases, getResult } = require("./act");
-const fs = require("fs");
+import * as puppeteer from 'puppeteer';
+import { getTestcases, getResult } from "./act.mjs";
+import * as fs from "fs";
 (async () => {
     let earlResult = {
         "@context": "https://act-rules.github.io/earl-context.json",
         "@graph": []
     }
     let ruleTestInfo = await getTestcases();
-    let browser = await puppeteer.launch({ headless: true, ignoreHTTPSErrors: true });
+    let browser = await puppeteer.launch({ headless: 'shell', ignoreHTTPSErrors: true });
     let pupPage = await browser.newPage();
     await pupPage.setRequestInterception(true);
     pupPage.on('request', request => {
diff --git a/accessibility-checker/test-act/package.json b/accessibility-checker/test-act/package.json
index f3a0612f4..3b9d2ea55 100644
--- a/accessibility-checker/test-act/package.json
+++ b/accessibility-checker/test-act/package.json
@@ -2,7 +2,8 @@
   "name": "test-act",
   "version": "1.0.0",
   "description": "Run ACT testcases",
+  "type": "module",
   "scripts": {
-    "test": "echo \"Results output to testOutput.txt\" && node main.js > testOutput.txt"
+    "test": "echo \"Results output to testOutput.txt\" && node --experimental-specifier-resolution=node main.mjs > testOutput.txt"
   }
 }
diff --git a/accessibility-checker/test/a11y-rule-test-able/aChecker.Content.Puppeteer.test.js b/accessibility-checker/test/a11y-rule-test-able/aChecker.Content.Puppeteer.test.js
index 555fcb5fe..3f54a5661 100755
--- a/accessibility-checker/test/a11y-rule-test-able/aChecker.Content.Puppeteer.test.js
+++ b/accessibility-checker/test/a11y-rule-test-able/aChecker.Content.Puppeteer.test.js
@@ -14,20 +14,25 @@
     limitations under the License.
   *****************************************************************************/
 
- 'use strict';
-
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
+'use strict';
+import * as fs from "fs";
+import * as path from "path";
 //Using local checker and location 
-var aChecker = require("../../src");
+import * as aChecker from "../../src/mjs/index.js";
+import ace from "../../../accessibility-checker-engine/dist/ace-node.js";
 //Using a checker local checker engine 
-const ace = require("../../../accessibility-checker-engine/dist/ace-node");
+import { expect } from "chai";
+import {fileURLToPath} from 'url';
+import * as puppeteer from "puppeteer";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+let unitTestcaseHTML = {};
 //Location of tests with path so fs can read?
 const urlList = fs.readFileSync(path.join(__dirname,"listofURLs.txt")).toString();
 console.log(urlList);
 const urls = urlList.split(/[\r\n]+/);
-var expect = require("chai").expect;
 
 const mapRuleToG = aChecker.ruleIdToLegacyId;
 
@@ -40,7 +45,6 @@ for (const key in mapRuleToG) {
 let validList = {};
 let policyMap = {};
 const checker = new ace.Checker();
-const puppeteer = require('puppeteer');
 let browser;
 let page;
 before(async function () {
@@ -71,7 +75,7 @@ after(async function () {
 })
 
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
-var skipList = [
+let skipList = [
 
     // Not in Karma Conf Skip list
     // Testcase has a script reference to a file, which traps when loaded as a string
@@ -107,7 +111,7 @@ var skipList = [
     path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules", "page_title_valid_ruleunit","Title-empty.html"),
     path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules", "page_title_valid_ruleunit","Title-invalidSpaces.html"),
 ]
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -119,7 +123,7 @@ describe("Rule Unit Tests As File URL", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
     for (const url of urls) {
@@ -142,7 +146,7 @@ describe("Rule Unit Tests As File URL", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var actualMap = {};
+                    let actualMap = {};
                     let report = null;
                     let puppeteer = null;
                     await page.goto(url);
diff --git a/accessibility-checker/test/baselines/Baseline_aChecker.Baseline.html.json b/accessibility-checker/test/baselines/Baseline_aChecker.Baseline.html.json
index 3ecaefde0..30d4eb75b 100644
--- a/accessibility-checker/test/baselines/Baseline_aChecker.Baseline.html.json
+++ b/accessibility-checker/test/baselines/Baseline_aChecker.Baseline.html.json
@@ -1,3 +1,4 @@
+
 {
     "results": [
         {
@@ -660,4 +661,4 @@
     "scanID": "e3856ce5-070e-4798-9dcc-9866c4468897",
     "toolID": "accessibility-checker-v3.0.0",
     "label": "Baseline_aChecker.Baseline.html"
-}
\ No newline at end of file
+}
diff --git a/accessibility-checker/test/baselines/Baseline_aChecker.Baseline2.html.json b/accessibility-checker/test/baselines/Baseline_aChecker.Baseline2.html.json
index 8043478bb..a90da8162 100644
--- a/accessibility-checker/test/baselines/Baseline_aChecker.Baseline2.html.json
+++ b/accessibility-checker/test/baselines/Baseline_aChecker.Baseline2.html.json
@@ -1,7 +1,7 @@
 {
     "results": [
         {
-            "ruleId": "WCAG20_Doc_HasTitle",
+            "ruleId": "page_title_exists",
             "value": [
                 "VIOLATION",
                 "FAIL"
@@ -27,33 +27,33 @@
             "level": "violation"
         },
         {
-            "ruleId": "WCAG20_Body_FirstASkips_Native_Host_Sematics",
+            "ruleId": "img_alt_valid",
             "value": [
                 "VIOLATION",
                 "FAIL"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
-            "reasonId": "Fail_1",
-            "message": "The page does not provide a way to quickly navigate to the main content (ARIA \"main\" landmark or a skip link)",
+            "reasonId": "fail_no_alt",
+            "message": "The image has neither an alt atttribute nor an ARIA label or title",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "left": 12,
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "violation"
         },
         {
-            "ruleId": "WCAG20_Img_HasAlt",
+            "ruleId": "img_alt_valid",
             "value": [
                 "VIOLATION",
                 "FAIL"
@@ -63,13 +63,13 @@
                 "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Fail_2",
-            "message": "Image does not have an 'alt' attribute short text alternative",
+            "reasonId": "fail_no_alt",
+            "message": "The image has neither an alt atttribute nor an ARIA label or title",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 22,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -79,44 +79,18 @@
             "level": "violation"
         },
         {
-            "ruleId": "WCAG20_Img_HasAlt",
+            "ruleId": "html_lang_exists",
             "value": [
                 "VIOLATION",
                 "FAIL"
             ],
-            "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Fail_2",
-            "message": "Image does not have an 'alt' attribute short text alternative",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 12,
-                "top": 22,
-                "height": 0,
-                "width": 0
-            },
-            "snippet": "<img src=\"fail.png\">",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "violation"
-        },
-        {
-            "ruleId": "RPT_Html_SkipNav",
-            "value": [
-                "VIOLATION",
-                "POTENTIAL"
-            ],
             "path": {
                 "dom": "/html[1]",
                 "aria": "/document[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Potential_1",
-            "message": "Verify there is a way to bypass blocks of content that are repeated on multiple Web pages",
+            "reasonId": "Fail_3",
+            "message": "Page detected as HTML, but does not have a 'lang' attribute",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
@@ -128,229 +102,21 @@
             "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
-            "level": "potentialviolation"
-        },
-        {
-            "ruleId": "HAAC_BackgroundImg_HasTextOrTitle",
-            "value": [
-                "RECOMMENDATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "Rpt_Aria_OrphanedContent_Native_Host_Sematics",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "RPT_List_UseMarkup",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "RPT_Text_SensoryReference",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "WCAG20_Text_Emoticons",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "WCAG20_Text_LetterSpacing",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "text_quoted_correctly",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "IBMA_Color_Contrast_WCAG2AA_PV",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 600,
-                "width": 800
-            },
-            "snippet": "<html>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
+            "level": "violation"
         },
         {
-            "ruleId": "HAAC_Aria_Native_Host_Semantics",
+            "ruleId": "html_skipnav_exists",
             "value": [
                 "VIOLATION",
-                "PASS"
+                "POTENTIAL"
             ],
             "path": {
                 "dom": "/html[1]",
                 "aria": "/document[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
+            "reasonId": "Potential_1",
+            "message": "Verify there is a way to bypass blocks of content that are repeated on multiple Web pages",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
@@ -362,199 +128,95 @@
             "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "HAAC_BackgroundImg_HasTextOrTitle",
-            "value": [
-                "RECOMMENDATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 0,
-                "width": 0
-            },
-            "snippet": "<head>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "Rpt_Aria_OrphanedContent_Native_Host_Sematics",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 0,
-                "width": 0
-            },
-            "snippet": "<head>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "RPT_List_UseMarkup",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 0,
-                "width": 0
-            },
-            "snippet": "<head>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
-        },
-        {
-            "ruleId": "RPT_Text_SensoryReference",
-            "value": [
-                "VIOLATION",
-                "PASS"
-            ],
-            "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
-            },
-            "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
-            "messageArgs": [],
-            "apiArgs": [],
-            "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 0,
-                "width": 0
-            },
-            "snippet": "<head>",
-            "category": "Accessibility",
-            "ignored": false,
-            "level": "pass"
+            "level": "potentialviolation"
         },
         {
-            "ruleId": "WCAG20_Text_Emoticons",
+            "ruleId": "text_whitespace_valid",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
+            "reasonId": "pass",
             "message": "Rule Passed",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 0,
-                "top": 0,
+                "left": 12,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<head>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_LetterSpacing",
+            "ruleId": "text_whitespace_valid",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
+            "reasonId": "pass",
             "message": "Rule Passed",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 0,
-                "top": 0,
+                "left": 8,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<head>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "text_quoted_correctly",
+            "ruleId": "text_whitespace_valid",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/head[1]",
+                "dom": "/html[1]/body[1]",
                 "aria": "/document[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
+            "reasonId": "pass",
             "message": "Rule Passed",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 0,
-                "top": 0,
-                "height": 0,
-                "width": 0
+                "left": 8,
+                "top": 8,
+                "height": 584,
+                "width": 784
             },
-            "snippet": "<head>",
+            "snippet": "<body>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_Aria_Native_Host_Semantics",
+            "ruleId": "text_sensory_misuse",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/head[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -562,25 +224,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 0,
-                "top": 0,
+                "left": 12,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<head>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_BackgroundImg_HasTextOrTitle",
+            "ruleId": "text_sensory_misuse",
             "value": [
-                "RECOMMENDATION",
+                "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -589,17 +251,17 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "Rpt_Aria_OrphanedContent_Native_Host_Sematics",
+            "ruleId": "text_sensory_misuse",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -625,14 +287,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "RPT_List_UseMarkup",
+            "ruleId": "text_quoted_correctly",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -640,25 +302,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "left": 12,
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "RPT_Text_SensoryReference",
+            "ruleId": "text_quoted_correctly",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -667,17 +329,17 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_Emoticons",
+            "ruleId": "text_quoted_correctly",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -703,13 +365,13 @@
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_LetterSpacing",
+            "ruleId": "list_markup_review",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
+                "dom": "/html[1]/head[1]",
                 "aria": "/document[1]"
             },
             "ruleTime": 0,
@@ -718,25 +380,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "left": 0,
+                "top": 0,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<head>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "text_quoted_correctly",
+            "ruleId": "list_markup_review",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -744,25 +406,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "left": 12,
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "IBMA_Color_Contrast_WCAG2AA_PV",
+            "ruleId": "list_markup_review",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]",
-                "aria": "/document[1]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -771,17 +433,17 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 8,
-                "height": 584,
-                "width": 784
+                "top": 23,
+                "height": 0,
+                "width": 0
             },
-            "snippet": "<body>",
+            "snippet": "<img src=\"fail.png\">",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_Aria_Native_Host_Semantics",
+            "ruleId": "list_markup_review",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -807,14 +469,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "RPT_Img_AltCommonMisuse",
+            "ruleId": "list_markup_review",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -822,25 +484,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 0,
+                "top": 0,
+                "height": 600,
+                "width": 800
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_BackgroundImg_HasTextOrTitle",
+            "ruleId": "img_alt_misuse",
             "value": [
-                "RECOMMENDATION",
+                "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -848,8 +510,8 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
+                "left": 12,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -859,7 +521,7 @@
             "level": "pass"
         },
         {
-            "ruleId": "Rpt_Aria_OrphanedContent_Native_Host_Sematics",
+            "ruleId": "img_alt_misuse",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -875,7 +537,7 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 22,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -885,14 +547,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "RPT_List_UseMarkup",
+            "ruleId": "img_alt_background",
             "value": [
-                "VIOLATION",
+                "RECOMMENDATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/head[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -900,25 +562,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
+                "left": 0,
+                "top": 0,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<head>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "RPT_Text_SensoryReference",
+            "ruleId": "img_alt_background",
             "value": [
-                "VIOLATION",
+                "RECOMMENDATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -926,8 +588,8 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
+                "left": 12,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -937,9 +599,9 @@
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_Emoticons",
+            "ruleId": "img_alt_background",
             "value": [
-                "VIOLATION",
+                "RECOMMENDATION",
                 "PASS"
             ],
             "path": {
@@ -953,7 +615,7 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 22,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -963,14 +625,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_LetterSpacing",
+            "ruleId": "img_alt_background",
             "value": [
-                "VIOLATION",
+                "RECOMMENDATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/body[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -979,24 +641,24 @@
             "apiArgs": [],
             "bounds": {
                 "left": 8,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "top": 8,
+                "height": 584,
+                "width": 784
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<body>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "text_quoted_correctly",
+            "ruleId": "img_alt_background",
             "value": [
-                "VIOLATION",
+                "RECOMMENDATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1004,25 +666,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 0,
+                "top": 0,
+                "height": 600,
+                "width": 800
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "IBMA_Color_Contrast_WCAG2AA_PV",
+            "ruleId": "emoticons_alt_exists",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/head[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1030,25 +692,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
+                "left": 0,
+                "top": 0,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<head>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_Aria_Native_Host_Semantics",
+            "ruleId": "emoticons_alt_exists",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[1]",
-                "aria": "/document[1]/img[1]"
+                "dom": "/html[1]/body[1]/img[2]",
+                "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1056,8 +718,8 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 8,
-                "top": 22,
+                "left": 12,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1067,14 +729,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "RPT_Img_AltCommonMisuse",
+            "ruleId": "emoticons_alt_exists",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1082,8 +744,8 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
+                "left": 8,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1093,14 +755,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_BackgroundImg_HasTextOrTitle",
+            "ruleId": "emoticons_alt_exists",
             "value": [
-                "RECOMMENDATION",
+                "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/body[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1108,25 +770,25 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 8,
+                "top": 8,
+                "height": 584,
+                "width": 784
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<body>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "Rpt_Aria_OrphanedContent_Native_Host_Sematics",
+            "ruleId": "emoticons_alt_exists",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1134,18 +796,18 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 0,
+                "top": 0,
+                "height": 600,
+                "width": 800
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "RPT_List_UseMarkup",
+            "ruleId": "aria_descendant_valid",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -1155,13 +817,13 @@
                 "aria": "/document[1]/img[2]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
+            "reasonId": "pass",
+            "message": "The element contains valid descendants",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
                 "left": 12,
-                "top": 22,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1171,23 +833,23 @@
             "level": "pass"
         },
         {
-            "ruleId": "RPT_Text_SensoryReference",
+            "ruleId": "aria_descendant_valid",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
-            "reasonId": "Pass_0",
-            "message": "Rule Passed",
+            "reasonId": "pass",
+            "message": "The element contains valid descendants",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
+                "left": 8,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1197,14 +859,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_Emoticons",
+            "ruleId": "aria_content_in_landmark",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/head[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1212,18 +874,18 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
+                "left": 0,
+                "top": 0,
                 "height": 0,
                 "width": 0
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<head>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "WCAG20_Text_LetterSpacing",
+            "ruleId": "aria_content_in_landmark",
             "value": [
                 "VIOLATION",
                 "PASS"
@@ -1239,7 +901,7 @@
             "apiArgs": [],
             "bounds": {
                 "left": 12,
-                "top": 22,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1249,14 +911,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "text_quoted_correctly",
+            "ruleId": "aria_content_in_landmark",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/body[1]/img[1]",
+                "aria": "/document[1]/img[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1264,8 +926,8 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
+                "left": 8,
+                "top": 23,
                 "height": 0,
                 "width": 0
             },
@@ -1275,14 +937,14 @@
             "level": "pass"
         },
         {
-            "ruleId": "IBMA_Color_Contrast_WCAG2AA_PV",
+            "ruleId": "aria_content_in_landmark",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]/body[1]",
+                "aria": "/document[1]"
             },
             "ruleTime": 0,
             "reasonId": "Pass_0",
@@ -1290,89 +952,100 @@
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 8,
+                "top": 8,
+                "height": 584,
+                "width": 784
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<body>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         },
         {
-            "ruleId": "HAAC_Aria_Native_Host_Semantics",
+            "ruleId": "aria_content_in_landmark",
             "value": [
                 "VIOLATION",
                 "PASS"
             ],
             "path": {
-                "dom": "/html[1]/body[1]/img[2]",
-                "aria": "/document[1]/img[2]"
+                "dom": "/html[1]",
+                "aria": "/document[1]"
             },
-            "ruleTime": 0,
+            "ruleTime": 1,
             "reasonId": "Pass_0",
             "message": "Rule Passed",
             "messageArgs": [],
             "apiArgs": [],
             "bounds": {
-                "left": 12,
-                "top": 22,
-                "height": 0,
-                "width": 0
+                "left": 0,
+                "top": 0,
+                "height": 600,
+                "width": 800
             },
-            "snippet": "<img src=\"fail.png\">",
+            "snippet": "<html>",
             "category": "Accessibility",
             "ignored": false,
             "level": "pass"
         }
     ],
-    "numExecuted": 52,
+    "numExecuted": 39,
     "nls": {
-        "WCAG20_Html_HasLang": {
+        "html_lang_exists": {
+            "0": "Page must identify the default language of the document with a 'lang' attribute",
             "Fail_3": "Page detected as HTML, but does not have a 'lang' attribute"
         },
-        "RPT_Html_SkipNav": {
+        "html_skipnav_exists": {
+            "0": "Provide a way to bypass blocks of content that are repeated on multiple Web pages",
             "Potential_1": "Verify there is a way to bypass blocks of content that are repeated on multiple Web pages"
         },
-        "WCAG20_Doc_HasTitle": {
+        "page_title_exists": {
+            "0": "The page should have a title that correctly identifies the subject of the page",
             "Fail_2": "Missing <title> element in <head> element"
         },
-        "HAAC_BackgroundImg_HasTextOrTitle": {
+        "aria_content_in_landmark": {
+            "0": "All content must reside within an element with a landmark role",
             "Pass_0": "Rule Passed"
         },
-        "Rpt_Aria_OrphanedContent_Native_Host_Sematics": {
+        "emoticons_alt_exists": {
+            "0": "Emoticons must have a short text alternative that describes their purpose",
             "Pass_0": "Rule Passed"
         },
-        "RPT_List_UseMarkup": {
+        "img_alt_background": {
+            "0": "Background images that convey important information must have a text alternative that describes the image",
             "Pass_0": "Rule Passed"
         },
-        "RPT_Text_SensoryReference": {
+        "list_markup_review": {
+            "0": "Use proper HTML list elements to create lists",
             "Pass_0": "Rule Passed"
         },
-        "WCAG20_Text_Emoticons": {
-            "Pass_0": "Rule Passed"
+        "skip_main_exists": {
+            "0": "Pages must provide a way to skip directly to the main content",
+            "Fail_1": "The page does not provide a way to quickly navigate to the main content (ARIA \"main\" landmark or a skip link)"
         },
-        "WCAG20_Text_LetterSpacing": {
+        "text_sensory_misuse": {
+            "0": "Instructions must be meaningful without shape or location words",
             "Pass_0": "Rule Passed"
         },
         "text_quoted_correctly": {
+            "0": "Quotations should be marked with <q> or <blockquote> elements",
             "Pass_0": "Rule Passed"
         },
-        "IBMA_Color_Contrast_WCAG2AA_PV": {
-            "Pass_0": "Rule Passed"
+        "text_whitespace_valid": {
+            "0": "Space characters should not be used to control spacing within a word",
+            "pass": "Rule Passed"
         },
-        "HAAC_Aria_Native_Host_Semantics": {
+        "img_alt_misuse": {
+            "0": "'alt' attribute value must be a good inline replacement for the image",
             "Pass_0": "Rule Passed"
         },
-        "WCAG20_Body_FirstASkips_Native_Host_Sematics": {
-            "Fail_1": "The page does not provide a way to quickly navigate to the main content (ARIA \"main\" landmark or a skip link)"
-        },
-        "WCAG20_Img_HasAlt": {
-            "Fail_2": "Image does not have an 'alt' attribute short text alternative"
+        "img_alt_valid": {
+            "0": "Images require an 'alt' attribute with a short text alternative if they convey meaning, or 'alt=\"\" if decorative",
+            "fail_no_alt": "The image has neither an alt atttribute nor an ARIA label or title"
         },
-        "RPT_Img_AltCommonMisuse": {
-            "Pass_0": "Rule Passed"
+        "aria_descendant_valid": {
+            "0": "Browsers ignore the explicit and implicit ARIA roles of the descendants of certain elements",
+            "pass": "The element contains valid descendants"
         }
     },
     "summary": {
@@ -1382,11 +1055,11 @@
             "recommendation": 0,
             "potentialrecommendation": 0,
             "manual": 0,
-            "pass": 46,
+            "pass": 33,
             "ignored": 0
         },
-        "scanTime": 5,
-        "ruleArchive": "",
+        "scanTime": 3,
+        "ruleArchive": "Preview Rules (preview)",
         "policies": [
             "IBM_Accessibility"
         ],
@@ -1398,10 +1071,10 @@
             "manual",
             "pass"
         ],
-        "startScan": 1582566852099,
+        "startScan": 1684285040429,
         "URL": "data:text/html;charset=utf-8,%3C!--%0A%20%20%20%20%20%2F******************************************************************************%0A%20%20%20%20%20Copyright%3A%3A%202020-%20IBM%2C%20Inc%0A%0A%20%20%20%20Licensed%20under%20the%20Apache%20License%2C%20Version%202.0%20(the%20%22License%22)%3B%0A%20%20%20%20you%20may%20not%20use%20this%20file%20except%20in%20compliance%20with%20the%20License.%0A%20%20%20%20You%20may%20obtain%20a%20copy%20of%20the%20License%20at%0A%0A%20%20%20%20http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0%0A%0A%20%20%20%20Unless%20required%20by%20applicable%20law%20or%20agreed%20to%20in%20writing%2C%20software%0A%20%20%20%20distributed%20under%20the%20License%20is%20distributed%20on%20an%20%22AS%20IS%22%20BASIS%2C%0A%20%20%20%20WITHOUT%20WARRANTIES%20OR%20CONDITIONS%20OF%20ANY%20KIND%2C%20either%20express%20or%20implied.%0A%20%20%20%20See%20the%20License%20for%20the%20specific%20language%20governing%20permissions%20and%0A%20%20%20%20limitations%20under%20the%20License.%0A%20%20*****************************************************************************%2F%0A%0A--%3E%20%0A%3Chtml%3E%0A%20%20%20%20%3Cbody%3E%0A%20%20%20%20%20%20%20%20%3Cimg%20src%3D%22fail.png%22%3E%0A%20%20%20%20%20%20%20%20%3Cimg%20src%3D%22fail.png%22%3E%0A%20%20%20%20%3C%2Fbody%3E%0A%3C%2Fhtml%3E"
     },
-    "scanID": "00b5c4de-a980-4344-92c9-856172c4e903",
-    "toolID": "accessibility-checker-v3.0.0",
+    "scanID": "5ce30134-4744-4d21-8368-1d963f91a3e4",
+    "toolID": "ibm-equal-access-toolkit-v3.0.0",
     "label": "Baseline_aChecker.Baseline2.html"
 }
\ No newline at end of file
diff --git a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/IBMa.Defined.test.js b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/IBMa.Defined.test.js
index 0c6402237..ad57c5d06 100644
--- a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/IBMa.Defined.test.js
+++ b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/IBMa.Defined.test.js
@@ -14,9 +14,9 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../src/");
-
+import * as aChecker from "../../../src/mjs/index.js";
+import { expect } from "chai";
+    
 // Check all aspects of the IBMa namespace to make sure that all things are defined.
 // Need to do this check, to make sure the engine is loaded into the browser correctly by the karma plugin.
 describe("Check IBMa namespace", function () {
diff --git a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/OpenAjax.Defined.test.js b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/OpenAjax.Defined.test.js
index 079ac0db1..5f49c0190 100644
--- a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/OpenAjax.Defined.test.js
+++ b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/OpenAjax.Defined.test.js
@@ -14,9 +14,9 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../src/");
-
+import * as aChecker from "../../../src/mjs/index.js";
+import { expect } from "chai";
+    
 // This Test Suite is to make sure all the objects/function in the OpenAjax namespace are
 // defined.
 // Need to do this check, to make sure the engine is loaded into the browser correctly by the karma plugin.
diff --git a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/RPT.Defined.test.js b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/RPT.Defined.test.js
index 262c6fcdd..78887e99a 100644
--- a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/RPT.Defined.test.js
+++ b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/RPT.Defined.test.js
@@ -14,9 +14,9 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../src/");
-
+import * as aChecker from "../../../src/mjs/index.js";
+import { expect } from "chai";
+    
 // This Test Suite is to make sure all the objects/function in the RPT namespace are
 // defined.
 describe("Check RPT namespace", function () {
diff --git a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/ValidationResult.Defined.test.js b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/ValidationResult.Defined.test.js
index 1613a781a..9bf90823d 100644
--- a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/ValidationResult.Defined.test.js
+++ b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/ValidationResult.Defined.test.js
@@ -14,9 +14,9 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../src/");
-
+import * as aChecker from "../../../src/mjs/index.js";
+import { expect } from "chai";
+    
 describe("ValidationResult", function () {
     it("Should be defined", function() {
         expect(typeof ValidationResult).not.toBe("undefined");
diff --git a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/getRule.Defined.test.js b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/getRule.Defined.test.js
index 4c6539de8..fa76a4811 100644
--- a/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/getRule.Defined.test.js
+++ b/accessibility-checker/test/mocha-old/IBMa.Engine.Functions.Defined/getRule.Defined.test.js
@@ -14,8 +14,8 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../src/");
+import * as aChecker from "../../../src/mjs/index.js";
+import { expect } from "chai";
 
 // Test to make sure the getRule function still exists in global space (window.getRule)
 describe("getRule", function () {
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.mjs
similarity index 82%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.mjs
index 37bf99992..e4b83668c 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Baselines/aChecker.Baseline.test.mjs
@@ -13,25 +13,26 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   *****************************************************************************/
- 'use strict';
+'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src")
-var expect = require("chai").expect;
-var util = require('util')
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+// import ace from "../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
+import * as util from "util";
 
-var files = ["aChecker.Baseline.html", "aChecker.Baseline2.html"];
+let unitTestcaseHTML = {};
+let files = ["aChecker.Baseline.html", "aChecker.Baseline2.html"];
 files.forEach(function (f) {
-    var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+    let fileExtension = f.substr(f.lastIndexOf('.') + 1);
     if (fileExtension === 'html' || fileExtension === 'htm') {
-        var f = path.join(process.cwd(), "test","mocha","aChecker.Fast","aChecker.Baselines",f);
+        f = path.join(process.cwd(), "test","mocha","aChecker.Fast","aChecker.Baselines",f);
         unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
     };
 });
 
-var codes = {};
+let codes = {};
 codes[path.join(process.cwd(), "test", "mocha", "aChecker.Fast", "aChecker.Baselines", "aChecker.Baseline.html")] = 0;
 codes[path.join(process.cwd(), "test", "mocha", "aChecker.Fast", "aChecker.Baselines", "aChecker.Baseline2.html")] = 1;
 
@@ -42,12 +43,12 @@ describe("Baseline testing", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -72,8 +73,8 @@ describe("Baseline testing", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
-                    var labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
+                    let unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
+                    let labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
                     // Perform the accessibility scan using the IBMaScan Wrapper
                     let result = await aChecker.getCompliance(unitTestDataFileContent, "Baseline_" + labelName);
                     let assertVal = aChecker.assertCompliance(result.report);
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.mjs
similarity index 94%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.mjs
index 78fd142af..cd4ad41ab 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/ACHelper.test.mjs
@@ -14,11 +14,11 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../../src");
+import * as aChecker from "../../../../src/mjs/index.js";
+import { expect } from "chai";
 
 before(async () => {
-    aChecker.Config = await aChecker.getConfig();
+    await aChecker.getConfig();
 });
 
 // This Test Suite is to make sure all the objects/function added by ACHelper.js is added
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.mjs
similarity index 56%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.mjs
index 67a398a6f..78362fa00 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Config.Defined.test.mjs
@@ -14,67 +14,68 @@
     limitations under the License.
   *****************************************************************************/
 
-var expect = require('chai').expect;
-var aChecker = require("../../../../src");
+import * as aChecker from "../../../../src/mjs/index.js";
+import { expect } from "chai";
+let Config;
 
 before(async () => {
-    aChecker.Config = await aChecker.getConfig();
+    Config = await aChecker.getConfig();
 });
 
-// Make sure the aChecker.Config is defined
-describe("aChecker.Config", function () {
+// Make sure the Config is defined
+describe("Config", function () {
     it("Should be defined in global space", function () {
-        expect(typeof aChecker.Config).to.not.equal("undefined");
+        expect(typeof Config).to.not.equal("undefined");
     });
 });
 
-// Make sure that all the config properties in the aChecker.Config are defined that need to be defined.
-describe("aChecker.Config property", function () {
+// Make sure that all the config properties in the Config are defined that need to be defined.
+describe("Config property", function () {
     it("DEBUG Should be defined in global space", function () {
-        expect(typeof aChecker.Config.DEBUG).to.not.equal("undefined");
+        expect(typeof Config.DEBUG).to.not.equal("undefined");
     });
 
     it("captureScreenshots Should be defined in global space", function () {
-        expect(typeof aChecker.Config.captureScreenshots).to.not.equal("undefined");
+        expect(typeof Config.captureScreenshots).to.not.equal("undefined");
     });
 
     it("checkHiddenContent Should be defined in global space", function () {
-        expect(typeof aChecker.Config.checkHiddenContent).to.not.equal("undefined");
+        expect(typeof Config.checkHiddenContent).to.not.equal("undefined");
     });
 
     it("extensions Should be defined in global space", function () {
-        expect(typeof aChecker.Config.extensions).to.not.equal("undefined");
+        expect(typeof Config.extensions).to.not.equal("undefined");
     });
 
     it("failLevels Should be defined in global space", function () {
-        expect(typeof aChecker.Config.failLevels).to.not.equal("undefined");
+        expect(typeof Config.failLevels).to.not.equal("undefined");
     });
 
     it("label Should be defined in global space", function () {
-        expect(typeof aChecker.Config.label).to.not.equal("undefined");
+        expect(typeof Config.label).to.not.equal("undefined");
     });
 
     it("outputFolder Should be defined in global space", function () {
-        expect(typeof aChecker.Config.outputFolder).to.not.equal("undefined");
+        expect(typeof Config.outputFolder).to.not.equal("undefined");
     });
 
     it("policies Should be defined in global space", function () {
-        expect(typeof aChecker.Config.policies).to.not.equal("undefined");
+        expect(typeof Config.policies).to.not.equal("undefined");
     });
 
     it("reportLevels Should be defined in global space", function () {
-        expect(typeof aChecker.Config.reportLevels).to.not.equal("undefined");
+        expect(typeof Config.reportLevels).to.not.equal("undefined");
     });
 
     it("ruleServer Should be defined in global space", function () {
-        expect(typeof aChecker.Config.ruleServer).to.not.equal("undefined");
+        expect(typeof Config.ruleServer).to.not.equal("undefined");
     });
 
     it("scanID Should be defined in global space", function () {
-        expect(typeof aChecker.Config.scanID).to.not.equal("undefined");
+        expect(typeof Config.scanID).to.not.equal("undefined");
     });
 
     it("toolID Should be defined in global space", function () {
-        expect(typeof aChecker.Config.toolID).to.not.equal("undefined");
+        expect(typeof Config.toolID).to.not.equal("undefined");
     });
 });
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Defined.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Defined.test.js
deleted file mode 100644
index 7a0d55320..000000000
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Functions.Defined/aChecker.Defined.test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-   /******************************************************************************
-     Copyright:: 2020- IBM, Inc
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-  *****************************************************************************/
-
-var expect = require('chai').expect;
-var aChecker = require("../../../../src");
-
-describe("aChecker", function () {
-    it("Should be defined", function () {
-        expect(typeof aChecker).to.not.equal("undefined");
-    });
-});
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.mjs
similarity index 82%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.mjs
index 8df075f4a..c99d0c411 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerification.test.mjs
@@ -16,17 +16,20 @@
 
  'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src")
-var expect = require("chai").expect;
-
-var files = ["JSONObjectStructureVerification.html"];
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import { expect } from "chai";
+import {fileURLToPath} from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+let unitTestcaseHTML = {};
+
+let files = ["JSONObjectStructureVerification.html"];
 files.forEach(function (f) {
-    var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+    let fileExtension = f.substr(f.lastIndexOf('.') + 1);
     if (fileExtension === 'html' || fileExtension === 'htm') {
-        var f = path.join(__dirname, f);
+        f = path.join(__dirname, f);
         unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
     };
 });
@@ -38,12 +41,12 @@ describe("JSON Structure Verification Zombie", function () {
     });
 
     // Variable Decleration
-    var originalPolicies;
+    let originalPolicies;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -78,17 +81,17 @@ describe("JSON Structure Verification Zombie", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
-                    var labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
+                    let unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
+                    let labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
                     // Perform the accessibility scan using the IBMaScan Wrapper
                     let report = await aChecker.getCompliance(unitTestDataFileContent, labelName);
                     report = report.report;
                     // Make sure that the structure of the result match with expected structure
                     // Fetch the baseline object based on the label provided
-                    var expected = aChecker.getBaseline(labelName);
+                    let expected = aChecker.getBaseline(labelName);
 
                     // Define the differences with some content as we expect it to be null or undefined if pass
-                    var differences = "Something";
+                    let differences = "Something";
 
 
 
@@ -129,6 +132,16 @@ describe("JSON Structure Verification Zombie", function () {
                         // Run the diff algo to get the list of differences
                         differences = aChecker.diffResultsWithExpected(report, expected, false);
                     }
+                    if (typeof differences !== "undefined") {
+                        differences = differences.filter(difference => (
+                            difference.kind !== "E"
+                            || difference.path[2] !== "bounds"
+                            || Math.abs(difference.lhs - difference.rhs) > 2
+                        ))
+                        if (differences.length === 0) {
+                            differences = undefined;
+                        }
+                    }
                     expect(typeof differences).to.equal("undefined", "\nDoes not follow the correct JSON structure or can't load baselines" + JSON.stringify(differences, null, '  '));
                     // Mark the testcase as done.
                 });
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
similarity index 92%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
index 8de6d3187..8069e4b36 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.Puppeteer.test.mjs
@@ -1,5 +1,5 @@
-   /******************************************************************************
-     Copyright:: 2020- IBM, Inc
+/******************************************************************************
+    Copyright:: 2020- IBM, Inc
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -12,19 +12,20 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-  *****************************************************************************/
+*****************************************************************************/
 
- 'use strict';
+'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-const ace = require("../../../../../accessibility-checker-engine/dist/ace-node");
-var testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
-var gdirs = fs.readdirSync(testRootDir);
-var expect = require("chai").expect;
-const { loadPuppeteerTestFile } = require("../../util/Util");
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
+import * as Util from "../../util/Util.js";
+import * as puppeteer from "puppeteer";
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 
 const mapRuleToG = aChecker.ruleIdToLegacyId;
 
@@ -37,7 +38,6 @@ for (const key in mapRuleToG) {
 let validList = {};
 let policyMap = {};
 const checker = new ace.Checker();
-const puppeteer = require('puppeteer');
 let browser;
 let page;
 before(async function () {
@@ -68,13 +68,13 @@ after(async function () {
 })
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
             };
         });
@@ -82,7 +82,7 @@ gdirs.forEach(function (gdir) {
 });
 
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
-var skipList = [
+let skipList = [
 
     // Not in Karma Conf Skip list
     // Testcase has a script reference to a file, which traps when loaded as a string
@@ -122,7 +122,7 @@ var skipList = [
     path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules", "aria_attribute_conflict_ruleunit","aria-hidden.html"),
 ]
 
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -134,13 +134,13 @@ describe("Rule Unit Tests As File URL", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -165,10 +165,10 @@ describe("Rule Unit Tests As File URL", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var actualMap = {};
+                    let actualMap = {};
                     let report = null;
                     let puppeteer = null;
-                    await loadPuppeteerTestFile(page, unitTestFile);
+                    await Util.default.loadPuppeteerTestFile(page, unitTestFile);
 
                     // Perform the accessibility scan using the IBMaScan Wrapper
                     return aChecker.getCompliance(page, "Puppeteer_" + unitTestFile)
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.mjs
similarity index 93%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.mjs
index 86147e1e8..bb21a90ed 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.Content.test.mjs
@@ -14,17 +14,17 @@
     limitations under the License.
   *****************************************************************************/
 
- 'use strict';
+'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-const ace = require("../../../../../accessibility-checker-engine/dist/ace-node");
-var testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
-var gdirs = fs.readdirSync(testRootDir);
-var expect = require("chai").expect;
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
 
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 const mapRuleToG = aChecker.ruleIdToLegacyId;
 
 let mapGToRule = {}
@@ -54,13 +54,13 @@ before(async function () {
 });
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
             };
         });
@@ -69,7 +69,7 @@ gdirs.forEach(function (gdir) {
 
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
 let testRoot = path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules");
-var skipList = [
+let skipList = [
 
     // Not in Karma Conf Skip list
     // Testcase has a script reference to a file, which traps when loaded as a string
@@ -109,7 +109,7 @@ var skipList = [
     path.join(testRoot, "aria_attribute_conflict_ruleunit","aria-hidden.html")
 ]
 
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -121,13 +121,13 @@ describe("Rule Unit Tests As Content", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -152,8 +152,8 @@ describe("Rule Unit Tests As Content", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
-                    var actualMap = {};
+                    let unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
+                    let actualMap = {};
                     let report = null;
                     let browser = null;
                     let puppeteer = null;
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.mjs
similarity index 94%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.mjs
index 1936812ef..ed6234f2b 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.URL.test.mjs
@@ -14,16 +14,17 @@
     limitations under the License.
   *****************************************************************************/
 
- 'use strict';
+'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-const ace = require("../../../../../accessibility-checker-engine/dist/ace-node");
-var testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
-var gdirs = fs.readdirSync(testRootDir);
-var expect = require("chai").expect;
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
+
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 
 const mapRuleToG = aChecker.ruleIdToLegacyId;
 
@@ -55,13 +56,13 @@ before(async function () {
 });
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = "file://" + f;
             };
         });
@@ -69,7 +70,7 @@ gdirs.forEach(function (gdir) {
 });
 
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
-var skipList = [
+let skipList = [
 
     // Not in Karma Conf Skip list
     // Testcase has a script reference to a file, which traps when loaded as a string
@@ -111,7 +112,7 @@ var skipList = [
     path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules", "aria_attribute_conflict_ruleunit","aria-hidden.html")
 ]
 
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -123,13 +124,13 @@ describe("Rule Unit Tests As URLs", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -154,8 +155,8 @@ describe("Rule Unit Tests As URLs", function () {
                     // Extract the unitTestcase data file from the unitTestcase hash map.
                     // This will contain the full content of the testcase file. Includes the document
                     // object also.
-                    var unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
-                    var actualMap = {};
+                    let unitTestDataFileContent = unitTestcaseHTML[unitTestFile];
+                    let actualMap = {};
                     let report = null;
                     let browser = null;
                     let puppeteer = null;
diff --git a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
similarity index 87%
rename from accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
rename to accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
index 2517a0c56..258a983fd 100644
--- a/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Fast/aChecker.Scans/aChecker.assertionCompliance.test.mjs
@@ -16,23 +16,23 @@
 
  'use strict';
 
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-const ace = require("../../../../../accessibility-checker-engine/dist/ace-node");
-var testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
-var gdirs = fs.readdirSync(testRootDir);
-var expect = require("chai").expect;
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+// import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
             };
         });
@@ -41,7 +41,7 @@ gdirs.forEach(function (gdir) {
 
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
 let testRoot = path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules")
-var skipList = [
+let skipList = [
     // Testcase has a script reference to a file, which traps when loaded as a string
     // Not in Karma conf skip list
     path.join(testRoot, "Hidden", "unitTestisNodeVisible.html"),
@@ -51,7 +51,7 @@ var skipList = [
     path.join(testRoot, "element_accesskey_labelled_ruleunit", "AssesskeyNeedsLabelHidden.html"),
     path.join(testRoot, "aria_activedescendant_valid_ruleunit", "ActiveDescendant.html")
 ]
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -63,14 +63,14 @@ describe("Rule Unit Tests With Assertion", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
 
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
diff --git a/accessibility-checker/test/mocha/aChecker.Playwright/aChecker.Scans/aChecker.Content.Playwright.spec.mjs b/accessibility-checker/test/mocha/aChecker.Playwright/aChecker.Scans/aChecker.Content.Playwright.spec.mjs
index 0efae9455..81e86fa1f 100644
--- a/accessibility-checker/test/mocha/aChecker.Playwright/aChecker.Scans/aChecker.Content.Playwright.spec.mjs
+++ b/accessibility-checker/test/mocha/aChecker.Playwright/aChecker.Scans/aChecker.Content.Playwright.spec.mjs
@@ -20,13 +20,12 @@ import { chromium } from "playwright";
 
 import * as fs from "fs";
 import * as path from "path";
-import * as aChecker from "../../../../src/index.js";
+import * as aChecker from "../../../../src/mjs/index.js";
 import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
-import Util from '../../util/Util.js';
-const { loadPuppeteerTestFile } = Util;
-var unitTestcaseHTML = {};
-var testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
-var gdirs = fs.readdirSync(testRootDir);
+import * as Util from '../../util/Util.js';
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 
 // gdirs = [
 //     "style_color_misuse_ruleunit",
@@ -75,13 +74,13 @@ test.afterAll(async () => {
 })
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
             };
         });
@@ -90,7 +89,7 @@ gdirs.forEach(function (gdir) {
 
 let testRoot = path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules");
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
-var skipList = [
+let skipList = [
     //not in karma conf file
     path.join(testRoot, "a_text_purpose_ruleunit", "A-hasTextEmbedded.html"),
     path.join(testRoot, "a_text_purpose_ruleunit", "A-nonTabable.html"),
@@ -108,7 +107,7 @@ var skipList = [
     path.join(testRoot, "aria_banner_label_unique_ruleunit", "validLandMarks-testCaseFromAnn.html")
 ]
 
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -120,14 +119,14 @@ test.describe("Rule Unit Tests from Playwright", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
     // let count = 10;
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
         // if (count-- < 0) continue;
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -148,7 +147,7 @@ test.describe("Rule Unit Tests from Playwright", function () {
                 // The Individual testcase for each of the unittestcases.
                 // Note the done that is passed in, this is used to wait for asyn functions.
                 test('a11y scan should match expected value', async () => {
-                    await loadPuppeteerTestFile(page, unitTestFile);
+                    await Util.default.loadPuppeteerTestFile(page, unitTestFile);
                     
                     let report = null;
                     // Perform the accessibility scan using the IBMaScan Wrapper
diff --git a/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.js b/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.mjs
similarity index 68%
rename from accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.js
rename to accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.mjs
index 9a95cb28c..24926b9f6 100644
--- a/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.ObjectStructure/aChecker.getCompliance.JSONObjectVerificationSelenium.test.mjs
@@ -14,27 +14,26 @@
     limitations under the License.
   *****************************************************************************/
 
- 'use strict';
-var userBrowser = process.env.USER_BROWSER || "CHROME";
-
-var webdriver = require('selenium-webdriver'),
-    By = webdriver.By,
-    until = webdriver.until;
-
-var fs = require("fs");
-var path = require("path");
-const { loadSeleniumTestFile } = require("../../util/Util");
-
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-var expect = require("chai").expect;
-
-var browser;
+'use strict';
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import { expect } from "chai";
+import { Builder, Capabilities } from "selenium-webdriver";
+import {fileURLToPath} from 'url';
+import * as Util from "../../util/Util.js";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+let userBrowser = process.env.USER_BROWSER || "CHROME";
+
+let unitTestcaseHTML = {};
+
+let browser;
 if (userBrowser.toUpperCase() === "FIREFOX") {
     before(function (done) {
         try {
             this.timeout(10000);
-            browser = new webdriver.Builder()
+            browser = new Builder()
                 .forBrowser('firefox')
                 .usingServer('http://localhost:4444/wd/hub')
                 .build();
@@ -45,40 +44,45 @@ if (userBrowser.toUpperCase() === "FIREFOX") {
         }
     });
 } else if (userBrowser.toUpperCase() === "CHROME") {
-    var chrome = require('selenium-webdriver/chrome');
     before(function (done) {
-        try {
-            this.timeout(10000);
-            var spath;
-            if (process.platform !== 'win32'){
-                spath = require('chromedriver').path;
-                spath = path.join(spath, "..");
-                spath = path.join(spath, "..");
-                spath = path.join(spath, "..");
-                spath = path.join(spath, "bin");
-                spath = path.join(spath, "chromedriver");
-            }
-            else {
-                spath = require('chromedriver').path;
+        this.timeout(10000);
+        (async () => {
+            try {
+                const chrome = (await import('selenium-webdriver/chrome.js'));
+                const chromedriver = (await import("chromedriver"));
+                let spath;
+                if (process.platform !== 'win32'){
+                    spath = chromedriver.path;
+                    spath = path.join(spath, "..");
+                    spath = path.join(spath, "..");
+                    spath = path.join(spath, "..");
+                    spath = path.join(spath, "bin");
+                    spath = path.join(spath, "chromedriver");
+                }
+                else {
+                    spath = chromedriver.path;
+                }
+
+                const options = new chrome.Options();
+                options.addArguments("--disable-dev-shm-usage");
+                options.addArguments("--headless=new");
+                options.addArguments('--ignore-certificate-errors')
+                const service = new chrome.ServiceBuilder(spath).build();
+                // setDefaultService function is removed since web-driver v4.3.1+
+                //chrome.setDefaultService(service);
+                chrome.Driver.createSession(options, service);
+
+                browser = new Builder()
+                    .withCapabilities(Capabilities.chrome())
+                    .setChromeOptions(options)
+                    .build();
+                browser.manage().window().setRect({x: 0, y:0, width: 13666, height: 784});
+                expect(typeof browser).to.not.equal("undefined");
+                done();
+            } catch (e) {
+                console.log(e);
             }
-            var service = new chrome.ServiceBuilder(spath).build();
-            chrome.setDefaultService(service);
-
-            const options = new chrome.Options();
-            options.addArguments("--disable-dev-shm-usage");
-            options.addArguments("--headless");
-            options.addArguments('--ignore-certificate-errors')
-
-            browser = new webdriver.Builder()
-                .withCapabilities(webdriver.Capabilities.chrome())
-                .setChromeOptions(options)
-                .build();
-            browser.manage().window().setRect({x: 0, y:0, width: 13666, height: 784});
-            expect(typeof browser).to.not.equal("undefined");
-            done();
-        } catch (e) {
-            console.log(e);
-        }
+        })();
     })
 }
 
@@ -86,11 +90,11 @@ after(function (done) {
     browser.quit().then(done);
 })
 
-var files = ["JSONObjectStructureVerificationSelenium.html"];
+let files = ["JSONObjectStructureVerificationSelenium.html"];
 files.forEach(function (f) {
-    var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+    let fileExtension = f.substr(f.lastIndexOf('.') + 1);
     if (fileExtension === 'html' || fileExtension === 'htm') {
-        var f = path.join(__dirname, f);
+        f = path.join(__dirname, f);
         unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
     };
 });
@@ -102,10 +106,10 @@ describe("JSON Structure Verification Selenium", function () {
     });
 
     // Variable Decleration
-    var originalPolicies;
+    let originalPolicies;
 
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
 
         // This function is used to execute for each of the unitTestFiles, we have to use this type of function
         // to allow dynamic creation/execution of the Unit Testcases. This is like forcing an syncronous execution
@@ -128,20 +132,20 @@ describe("JSON Structure Verification Selenium", function () {
                 it('JSON structure should match baseline for selenium', function (done) {
                     this.timeout(0);
 
-                    var labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
+                    let labelName = unitTestFile.substring(Math.max(unitTestFile.lastIndexOf("/"), unitTestFile.lastIndexOf("\\")) + 1);
 
-                    loadSeleniumTestFile(browser, unitTestFile).then(function () {
+                    Util.default.loadSeleniumTestFile(browser, unitTestFile).then(function () {
                         // Decleare the actualMap which will store all the actual xpath results
-                        var actualMap = {};
+                        let actualMap = {};
                         // Perform the accessibility scan using the IBMaScan Wrapper
                         aChecker.getCompliance(browser, labelName, function (report, doc) {
                             try {
                                 // Make sure that the structure of the result match with expected structure
                                 // Fetch the baseline object based on the label provided
-                                var expected = aChecker.getBaseline(labelName);
+                                let expected = aChecker.getBaseline(labelName);
                                 
                                 // Define the differences with some content as we expect it to be null or undefined if pass
-                                var differences = "Something";
+                                let differences = "Something";
 
                                 // Update all the items in the results which dynamically change over scans to the values
                                 // already defined in the baseline file.
@@ -183,7 +187,17 @@ describe("JSON Structure Verification Selenium", function () {
                                     // Run the diff algo to get the list of differences
                                     differences = aChecker.diffResultsWithExpected(report, expected, false);
                                 }
-
+                                if (typeof differences !== "undefined") {
+                                    differences = differences.filter(difference => (
+                                        difference.kind !== "E"
+                                        || difference.path[2] !== "bounds"
+                                        || Math.abs(difference.lhs - difference.rhs) > 2
+                                    ))
+                                    if (differences.length === 0) {
+                                        differences = undefined;
+                                    }
+                                }
+            
                                 expect(typeof differences).to.equal("undefined", "\nDoes not follow the correct JSON structure or can't load baselines" + JSON.stringify(differences, null, '  '));
 
                                 // Mark the testcase as done.
diff --git a/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.js b/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.mjs
similarity index 80%
rename from accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.js
rename to accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.mjs
index 4ac5357e7..302aec4ef 100644
--- a/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.js
+++ b/accessibility-checker/test/mocha/aChecker.Slow1/aChecker.Scans/aChecker.Content.Selenium.test.mjs
@@ -15,26 +15,23 @@
 *****************************************************************************/
 
 'use strict';
-var userBrowser = process.env.USER_BROWSER || "CHROME";
+import * as fs from "fs";
+import * as path from "path";
+import * as aChecker from "../../../../src/mjs/index.js";
+import ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { expect } from "chai";
+import { Builder, Capabilities } from "selenium-webdriver";
+import * as Util from "../../util/Util.js";
 
-var webdriver = require('selenium-webdriver'),
-    By = webdriver.By,
-    until = webdriver.until;
-
-var fs = require("fs");
-var path = require("path");
-var unitTestcaseHTML = {};
-var aChecker = require("../../../../src");
-const ace = require("../../../../../accessibility-checker-engine/dist/ace-node");
-const { loadSeleniumTestFile } = require("../../util/Util");
-var testRootDir = path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules");
-var gdirs = fs.readdirSync(testRootDir);
+let userBrowser = process.env.USER_BROWSER || "CHROME";
+let unitTestcaseHTML = {};
+let testRootDir = path.join(process.cwd(), "..","accessibility-checker-engine","test","v2","checker","accessibility","rules");
+let gdirs = fs.readdirSync(testRootDir);
 
 // gdirs = [
 //     "style_color_misuse_ruleunit",
 //     "a_text_purpose_ruleunit",
 //     "style_before_after_review_ruleunit"]
-var expect = require("chai").expect;
 
 const mapRuleToG = aChecker.ruleIdToLegacyId;
 
@@ -65,12 +62,12 @@ before(async function () {
     });
 });
 
-var browser;
+let browser;
 if (userBrowser.toUpperCase() === "FIREFOX") {
     before(function (done) {
         try {
             this.timeout(10000);
-            browser = new webdriver.Builder()
+            browser = new Builder()
                 .forBrowser('firefox')
                 .usingServer('http://localhost:4444/wd/hub')
                 .build();
@@ -81,37 +78,42 @@ if (userBrowser.toUpperCase() === "FIREFOX") {
         }
     })
 } else if (userBrowser.toUpperCase() === "CHROME") {
-    var chrome = require('selenium-webdriver/chrome');
     before(function (done) {
-        try {
-            this.timeout(10000);
-            var spath = require('chromedriver').path;
-            spath = path.join(spath, "..");
-            spath = path.join(spath, "..");
-            spath = path.join(spath, "..");
-            spath = path.join(spath, "bin");
-            spath = path.join(spath, "chromedriver");
-
-            var service = new chrome.ServiceBuilder(spath).build();
+        this.timeout(10000);
+        (async () => {
             try {
-                chrome.setDefaultService(service);
-            } catch (e) { }
-            const options = new chrome.Options();
-            options.addArguments("--disable-dev-shm-usage");
-            options.addArguments("--headless");
-            options.addArguments('--ignore-certificate-errors')
+                const chrome = await import('selenium-webdriver/chrome.js');
+                const chromedriver = await import('chromedriver');
+                let spath = chromedriver.path;
+                spath = path.join(spath, "..");
+                spath = path.join(spath, "..");
+                spath = path.join(spath, "..");
+                spath = path.join(spath, "bin");
+                spath = path.join(spath, "chromedriver");
 
-            browser = new webdriver.Builder()
-                .withCapabilities(webdriver.Capabilities.chrome())
-                .setChromeOptions(options)
-                .build();
+                try {
+                    const service = new chrome.ServiceBuilder(spath).build();
+                    // setDefaultService function is removed since web-driver v4.3.1+
+                    //chrome.setDefaultService(service);
+                    chrome.Driver.createSession(options, service);
+                } catch (e) {}
+                const options = new chrome.Options();
+                options.addArguments("--disable-dev-shm-usage");
+                options.addArguments("--headless=new");
+                options.addArguments('--ignore-certificate-errors')
 
-            browser.manage().window().setRect({ x: 0, y: 0, width: 13666, height: 784 });
-            expect(typeof browser).to.not.equal("undefined");
-            done();
-        } catch (e) {
-            console.log(e);
-        }
+                browser = new Builder()
+                    .withCapabilities(Capabilities.chrome())
+                    .setChromeOptions(options)
+                    .build();
+                    
+                browser.manage().window().setRect({x: 0, y:0, width: 13666, height: 784});
+                expect(typeof browser).to.not.equal("undefined");
+                done();
+            } catch (e) {
+                console.log(e);
+            }
+        })();
     })
 }
 
@@ -120,13 +122,13 @@ after(function (done) {
 })
 
 gdirs.forEach(function (gdir) {
-    var gdir = path.join(testRootDir, gdir)
+    gdir = path.join(testRootDir, gdir)
     if (fs.lstatSync(gdir).isDirectory()) {
-        var files = fs.readdirSync(gdir);
+        let files = fs.readdirSync(gdir);
         files.forEach(function (f) {
-            var fileExtension = f.substr(f.lastIndexOf('.') + 1);
+            let fileExtension = f.substr(f.lastIndexOf('.') + 1);
             if (fileExtension === 'html' || fileExtension === 'htm') {
-                var f = path.join(gdir, f);
+                f = path.join(gdir, f);
                 unitTestcaseHTML[f] = fs.readFileSync(f, 'utf8');
             };
         });
@@ -135,7 +137,7 @@ gdirs.forEach(function (gdir) {
 
 let testRoot = path.join(process.cwd(), "..", "accessibility-checker-engine", "test", "v2", "checker", "accessibility", "rules");
 // Skip test cases that don't work in this environment (e.g., can't disable meta refresh in chrome)
-var skipList = [
+let skipList = [
     //not in karma conf file
     path.join(testRoot, "a_text_purpose_ruleunit", "A-hasTextEmbedded.html"),
     path.join(testRoot, "a_text_purpose_ruleunit", "A-nonTabable.html"),
@@ -153,7 +155,7 @@ var skipList = [
     path.join(testRoot, "aria_banner_label_unique_ruleunit", "validLandMarks-testCaseFromAnn.html")
 ]
 
-var skipMap = {}
+let skipMap = {}
 skipList.forEach(function (skip) {
     skipMap[skip] = true;
 });
@@ -165,14 +167,14 @@ describe("Rule Unit Tests from Selenium", function () {
     });
 
     // Variable Decleration
-    var originalTimeout;
+    let originalTimeout;
     // let count = 10;
     // Loop over all the unitTestcase html/htm files and perform a scan for them
-    for (var unitTestFile in unitTestcaseHTML) {
+    for (let unitTestFile in unitTestcaseHTML) {
         if (unitTestFile in skipMap) continue;
         // if (count-- < 0) continue;
         // Get the extension of the file we are about to scan
-        var fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
+        let fileExtension = unitTestFile.substr(unitTestFile.lastIndexOf('.') + 1);
 
         // Make sure the unit testcase we are trying to scan is actually and html/htm files, if it is not
         // just move on to the next one.
@@ -195,8 +197,8 @@ describe("Rule Unit Tests from Selenium", function () {
                 it('a11y scan should match expected value', function (done) {
                     this.timeout(0);
 
-                    var regex = "test.*html?$";
-                    loadSeleniumTestFile(browser, unitTestFile).then(function () {
+                    let regex = "test.*html?$";
+                    Util.default.loadSeleniumTestFile(browser, unitTestFile).then(function () {
                         let report = null;
                         // Perform the accessibility scan using the IBMaScan Wrapper
                         aChecker.getCompliance(browser, "Selenium_" + unitTestFile)
diff --git a/accessibility-checker/test/webdriverio/test/specs/example.e2e.ts b/accessibility-checker/test/webdriverio/test/specs/example.e2e.ts
index 0f317c2d8..54a2c8555 100644
--- a/accessibility-checker/test/webdriverio/test/specs/example.e2e.ts
+++ b/accessibility-checker/test/webdriverio/test/specs/example.e2e.ts
@@ -1,7 +1,8 @@
 import * as fs from "fs"; // file system
 import * as path from "path";
-import { getCompliance, ruleIdToLegacyId, getConfig, close } from "../../../../src/index";
-import * as ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+import { getCompliance, ruleIdToLegacyId, getConfig, close } from "../../../../src/cjs/index";
+//import * as ace from "../../../../../accessibility-checker-engine/dist/ace-node.js";
+
 const unitTestcaseHTML = {};
 const testRootDir = path.join(process.cwd(), "..", "..", "..", "accessibility-checker-engine","test","v2","checker","accessibility","rules");
 const gdirs = fs.readdirSync(testRootDir);
@@ -21,6 +22,8 @@ for (const key in mapRuleToG) {
 // Determine which rules are in policy
 let validList = {};
 let policyMap = {};
+let ace = require("../../../../../accessibility-checker-engine/dist/ace-node.js");
+
 const checker = new ace.Checker();
 before(async function () {
     let config = await getConfig();
diff --git a/accessibility-checker/test/webdriverio/tsconfig.json b/accessibility-checker/test/webdriverio/tsconfig.json
index 1bff5bab1..8654a7231 100644
--- a/accessibility-checker/test/webdriverio/tsconfig.json
+++ b/accessibility-checker/test/webdriverio/tsconfig.json
@@ -1,6 +1,8 @@
 {
     "compilerOptions": {
         "moduleResolution": "node",
+        "esModuleInterop": true,
+        "experimentalDecorators": true,
         "module": "commonjs",
         "types": [
             "node",
@@ -8,6 +10,6 @@
             "expect-webdriverio",
             "@wdio/mocha-framework"
         ],
-        "target": "es2022"
+        "target": "ES2015"
     }
 }
\ No newline at end of file
diff --git a/accessibility-checker/tsconfig-base.json b/accessibility-checker/tsconfig-base.json
new file mode 100644
index 000000000..9073924f4
--- /dev/null
+++ b/accessibility-checker/tsconfig-base.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "moduleResolution": "node",
+        "lib": ["es2016", "esnext", "dom"],
+        "declaration": true,
+        "allowJs": true,
+        "removeComments": false,
+        "noEmitOnError": true,
+        "sourceMap": true,
+        //"alwaysStrict": true,
+        "esModuleInterop": true,
+    },
+    "include": [
+        "src-ts/**/*.ts",
+        "src-ts/**/*.js"
+    ],
+    "exclude": [
+        "node_modules",
+        "coverage",
+        ".nyc_output"
+    ]
+}
\ No newline at end of file
diff --git a/accessibility-checker/tsconfig-cjs.json b/accessibility-checker/tsconfig-cjs.json
new file mode 100644
index 000000000..67b38c1be
--- /dev/null
+++ b/accessibility-checker/tsconfig-cjs.json
@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig-base.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "outDir": "src/cjs",
+        "target": "es2015"
+    }
+}
\ No newline at end of file
diff --git a/accessibility-checker/tsconfig.json b/accessibility-checker/tsconfig.json
index 8cb6dc230..0c5134bf8 100644
--- a/accessibility-checker/tsconfig.json
+++ b/accessibility-checker/tsconfig.json
@@ -1,29 +1,8 @@
 {
+    "extends": "./tsconfig-base.json",
     "compilerOptions": {
-        "declaration": true,
-        "allowJs": true,
-        "target": "ES5",
-        "removeComments": false,
-        "noEmitOnError": true,
-        "sourceMap": true,
-        "moduleResolution": "node",
-        "alwaysStrict": true,
-        "experimentalDecorators": true,
-        // "module": "commonjs",
-        "outDir": "src",
-        "emitDecoratorMetadata": true,
-        "lib": [
-            "dom",
-            "es7"
-         ]
-    },
-    "include": [
-        "src-ts/**/*.ts",
-        "src-ts/**/*.js"
-    ],
-    "exclude": [
-        "node_modules",
-        "coverage",
-        ".nyc_output"
-    ]
+        "module": "esnext",
+        "outDir": "src/mjs",
+        "target": "esnext"
+    }
 }
\ No newline at end of file
diff --git a/common/module/package.json b/common/module/package.json
index f54b9c07d..fe6caf6ee 100644
--- a/common/module/package.json
+++ b/common/module/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build:htmlreport": "(cd ../../report-react && npm run build && cd ../common/module && shx cp ../../report-react/build/genReport.tsx ./src//report/genReport.ts)",
-    "build": "rm -rf dist && npm run build:htmlreport && npx tsc -p tsconfig-mjs.json && npx tsc -p tsconfig-cjs.json",
+    "build": "rm -rf dist && npm run build:htmlreport && npx tsc -p tsconfig-cjs.json && sed -i'.old' 's/\\/\\/ const __filename/const __filename/g; s/\\/\\/ import { fileURLToPath }/import { fileURLToPath }/g' ./src/config/ACConfigManager.ts && npx tsc -p tsconfig-mjs.json && sed -i'.old' 's/const __filename/\\/\\/ const __filename/g; s/import { fileURLToPath }/\\/\\/ import { fileURLToPath }/g' ./src/config/ACConfigManager.ts && rm ./src/config/ACConfigManager.ts.old",
     "test": "npm run build && jest"
   },
   "author": "IBM",
diff --git a/common/module/src/api-ext/IAbstractAPI.ts b/common/module/src/api-ext/IAbstractAPI.ts
index 037c30a61..f6e737f87 100644
--- a/common/module/src/api-ext/IAbstractAPI.ts
+++ b/common/module/src/api-ext/IAbstractAPI.ts
@@ -14,7 +14,7 @@
     limitations under the License.
 *****************************************************************************/
 
-import { IBaselineReport, IBaselineResult } from "../engine/IReport";
+import { IBaselineReport, IBaselineResult } from "../engine/IReport.js";
 
 /**
  * Interface for writing files
diff --git a/common/module/src/config/ACConfigManager.ts b/common/module/src/config/ACConfigManager.ts
index e2a17e4ef..39ac8d553 100644
--- a/common/module/src/config/ACConfigManager.ts
+++ b/common/module/src/config/ACConfigManager.ts
@@ -22,7 +22,10 @@ import * as crypto from 'crypto';
 import { IConfig, IConfigInternal } from "./IConfig";
 import { fetch_get } from "../api-ext/Fetch";
 import { ReporterManager } from "../report/ReporterManager";
+import path from 'path';
 import { IArchive } from "./IArchive";
+// This line will be modified by sed for cjs vs mjs environments. Look at package.json before modifying
+// import { fileURLToPath } from 'url';
 
 /**
  * This function is responsible converting policies into an Array based on string or Array.
@@ -247,7 +250,15 @@ function initializeDefaults(config: IConfigInternal) {
     // Load in the package.json file so that we can extract the module name and the version to build
     // a toolID which needs to be used when results are build for the purpose of keeping track of
     // which tool is uploading the results.
-    let packageDir = __dirname;
+    let packageDir = "";
+    try {
+        packageDir = __dirname;
+    } catch (err) {
+        // This line will be modified by sed for cjs vs mjs environments. Look at package.json before modifying
+        // const __filename = fileURLToPath(import.meta.url);
+        const __dirname = path.dirname(__filename);
+        packageDir = __dirname;
+    }
     while (!fs.existsSync(pathLib.join(packageDir, "package.json"))) {
         packageDir = pathLib.join(packageDir, "..");
     }
diff --git a/common/module/src/config/ACConstants.ts b/common/module/src/config/ACConstants.ts
index ef94b8bab..17f2d72b3 100644
--- a/common/module/src/config/ACConstants.ts
+++ b/common/module/src/config/ACConstants.ts
@@ -22,7 +22,7 @@
 // Load all the modules that are needed
 import { tmpdir } from "os";
 import * as pathLib from "path";
-import { IConfigInternal, eRuleLevel } from "./IConfig";
+import { IConfigInternal, eRuleLevel } from "./IConfig.js";
 
 // Used to specify all the constant
 export const ACConstants : IConfigInternal = {
@@ -83,7 +83,7 @@ export const ACConstants : IConfigInternal = {
     configFiles: [".achecker.yml", ".achecker.yaml", "achecker", "aceconfig", pathLib.join(".config", ".achecker.yml"), pathLib.join(".config", ".achecker.yaml"), pathLib.join(".config", "achecker"), pathLib.join(".config", "aceconfig")],
 
     ignoreHTTPSErrors: false,
-
+    headless: "shell",
     perfMetrics: true,
     engineMode: "DEFAULT"
 };
diff --git a/common/module/src/config/IConfig.ts b/common/module/src/config/IConfig.ts
index 4aac34264..f7fc98e71 100644
--- a/common/module/src/config/IConfig.ts
+++ b/common/module/src/config/IConfig.ts
@@ -14,7 +14,7 @@
     limitations under the License.
  *****************************************************************************/
 
-import { IArchive } from "./IArchive"
+import { IArchive } from "./IArchive.js"
 
 export enum eAssertResult {
     ERROR = -1,
@@ -157,7 +157,7 @@ export type IConfigInternal = IConfig & {
     /**
      * (optional) If the tool allows, should we run headless
      */
-    headless?: boolean
+    headless?: "shell" | boolean
 
     /**
      * (optional) If the tool allows, set the maximum number of tabs to open
@@ -180,5 +180,4 @@ export type IConfigInternal = IConfig & {
     perfMetrics: boolean
 
     engineMode: "DEFAULT" | "REMOTE" | "INJECT"
-
 }
diff --git a/common/module/src/report/BaselineManager.ts b/common/module/src/report/BaselineManager.ts
index a5fc95f91..85bfcda06 100644
--- a/common/module/src/report/BaselineManager.ts
+++ b/common/module/src/report/BaselineManager.ts
@@ -14,9 +14,9 @@
     limitations under the License.
 *****************************************************************************/
 
-import { IAbstractAPI } from "../api-ext/IAbstractAPI";
-import { IConfigInternal, eAssertResult } from "../config/IConfig";
-import { IBaselineReport } from "../engine/IReport";
+import { IAbstractAPI } from "../api-ext/IAbstractAPI.js";
+import { IConfigInternal, eAssertResult } from "../config/IConfig.js";
+import { IBaselineReport } from "../engine/IReport.js";
 import * as DeepDiff from "deep-diff";
 
 export type RefactorMap = {
@@ -211,7 +211,11 @@ export class BaselineManager {
         }
 
         // Run Deep diff function to compare the actual and expected values.
-        let differences = DeepDiff.diff(actual, expected);
+        let diff = DeepDiff.diff;
+        if (!diff) {
+            diff = DeepDiff.default.diff;
+        }
+        let differences = diff(actual, expected);
         if (differences) {
             differences = differences.filter(difference => !(
                 difference.kind === "E"
diff --git a/common/module/src/report/ReporterManager.ts b/common/module/src/report/ReporterManager.ts
index 605fc8a5c..079e35fbd 100644
--- a/common/module/src/report/ReporterManager.ts
+++ b/common/module/src/report/ReporterManager.ts
@@ -364,7 +364,7 @@ export class ReporterManager {
     private static filterReport(engineResult: IEngineReport, scanLabel: string): IBaselineReport {
         let ignoreLookup = {}
         let baselineReport = ReporterManager.absAPI.loadBaseline(scanLabel);
-        if (baselineReport) {
+        if (baselineReport && baselineReport.results) {
             for (const issue of baselineReport.results) {
                 ignoreLookup[issue.path.dom] = ignoreLookup[issue.path.dom] || {}
                 ignoreLookup[issue.path.dom][issue.ruleId] = ignoreLookup[issue.path.dom][issue.ruleId] || {}
diff --git a/cypress-accessibility-checker/package-lock.json b/cypress-accessibility-checker/package-lock.json
index 907868c68..bba5ce9f8 100644
--- a/cypress-accessibility-checker/package-lock.json
+++ b/cypress-accessibility-checker/package-lock.json
@@ -295,7 +295,8 @@
             "version": "18.18.0",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.0.tgz",
             "integrity": "sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw==",
-            "dev": true
+            "dev": true,
+            "optional": true
         },
         "node_modules/@types/sinonjs__fake-timers": {
             "version": "8.1.1",
@@ -1034,21 +1035,20 @@
             }
         },
         "node_modules/cypress": {
-            "version": "13.2.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
-            "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
+            "version": "13.13.1",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.13.1.tgz",
+            "integrity": "sha512-8F9UjL5MDUdgC/S5hr8CGLHbS5gGht5UOV184qc2pFny43fnkoaKxlzH/U6//zmGu/xRTaKimNfjknLT8+UDFg==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
                 "@cypress/request": "^3.0.0",
                 "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^18.17.5",
                 "@types/sinonjs__fake-timers": "8.1.1",
                 "@types/sizzle": "^2.3.2",
                 "arch": "^2.2.0",
                 "blob-util": "^2.0.2",
                 "bluebird": "^3.7.2",
-                "buffer": "^5.6.0",
+                "buffer": "^5.7.1",
                 "cachedir": "^2.3.0",
                 "chalk": "^4.1.0",
                 "check-more-types": "^2.24.0",
@@ -1066,7 +1066,7 @@
                 "figures": "^3.2.0",
                 "fs-extra": "^9.1.0",
                 "getos": "^3.2.1",
-                "is-ci": "^3.0.0",
+                "is-ci": "^3.0.1",
                 "is-installed-globally": "~0.4.0",
                 "lazy-ass": "^1.6.0",
                 "listr2": "^3.8.3",
@@ -1080,7 +1080,7 @@
                 "request-progress": "^3.0.0",
                 "semver": "^7.5.3",
                 "supports-color": "^8.1.1",
-                "tmp": "~0.2.1",
+                "tmp": "~0.2.3",
                 "untildify": "^4.0.0",
                 "yauzl": "^2.10.0"
             },
@@ -3207,6 +3207,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -3631,14 +3632,11 @@
             "dev": true
         },
         "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dependencies": {
-                "rimraf": "^3.0.0"
-            },
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+            "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
             "engines": {
-                "node": ">=8.17.0"
+                "node": ">=14.14"
             }
         },
         "node_modules/tough-cookie": {
diff --git a/karma-accessibility-checker/test/client/aChecker.getCompliance.JSONObjectVerification.test.js b/karma-accessibility-checker/test/client/aChecker.getCompliance.JSONObjectVerification.test.js
index 9cda64ba0..1c685ac7c 100644
--- a/karma-accessibility-checker/test/client/aChecker.getCompliance.JSONObjectVerification.test.js
+++ b/karma-accessibility-checker/test/client/aChecker.getCompliance.JSONObjectVerification.test.js
@@ -109,6 +109,16 @@ describe("JSONObjectVerification.test aChecker.getCompliance", function () {
                         })
                         // Run the diff algo to get the list of differences
                         differences = aChecker.diffResultsWithExpected(report, expected, true);
+                        if (typeof differences !== "undefined") {
+                            differences = differences.filter(difference => (
+                                difference.kind !== "E"
+                                || difference.path[2] !== "bounds"
+                                || Math.abs(difference.lhs - difference.rhs) > 2
+                            ))
+                            if (differences.length === 0) {
+                                differences = undefined;
+                            }
+                        }
                     }
                     expect(typeof differences).toEqual("undefined", "\nDoes not follow the correct JSON structure or can't load baselines" + JSON.stringify(differences, null, '  '));
                 });