From bf24ad72ff5032ff648679d7fd17309e0ddf642c Mon Sep 17 00:00:00 2001
From: Jason Karns <jason.karns@gmail.com>
Date: Thu, 3 Mar 2016 16:56:47 -0500
Subject: [PATCH 01/40] Allow `include` to be specified, but empty

Right now, if context is given as `{include: [], exclude[]}`, the `include` piece does not get properly defaulted to `[document]`.

The following are already accepted and work as expected:
- `{include: null}`
- `{include: undefined}`
- `{include: ""}`
- `{exclude: []}`

I don't think there is an appreciable difference for the `include` key between `null`, `undefined`, `""` and `[]`, so I think the following should be supported as well:

`{include: []}`

(To be fair, right now any falsey value for `include` would default to `[document]`, but I'm not suggesting that `0` or `false` should be supported, even though they current work.)
---
 lib/core/base/context.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/base/context.js b/lib/core/base/context.js
index 99ddc3b938..515ebae6ef 100644
--- a/lib/core/base/context.js
+++ b/lib/core/base/context.js
@@ -84,7 +84,7 @@ function normalizeContext(context) {
 
 		if (context.hasOwnProperty('include') || context.hasOwnProperty('exclude')) {
 			return {
-				include: context.include || [document],
+				include: (context.include && +context.include.length) ? context.include : [document],
 				exclude: context.exclude || []
 			};
 		}

From ed0ba6ce7196fd5a87c21919858914f141fa0241 Mon Sep 17 00:00:00 2001
From: Jason Karns <jason@karns.name>
Date: Fri, 18 Mar 2016 08:24:24 -0400
Subject: [PATCH 02/40] test

---
 test/core/base/context.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/core/base/context.js b/test/core/base/context.js
index e323961119..6c66811ed0 100644
--- a/test/core/base/context.js
+++ b/test/core/base/context.js
@@ -316,6 +316,12 @@ describe('Context', function() {
 
 		});
 
+		it('should default empty-object include to document', function () {
+			var result = new Context({ include: {}, exclude: {} });
+			assert.lengthOf(result.include, 1);
+			assert.equal(result.include[0], document);
+		});
+
 	});
 
 	describe('initiator', function() {
@@ -342,7 +348,7 @@ describe('Context', function() {
 			var spec = document.implementation.createHTMLDocument('ie is dumb');
 			spec.hasOwnProperty = undefined;
 			var result = new Context(spec);
-			
+
 			assert.lengthOf(result.include, 1);
 			assert.equal(result.include[0], spec);
 

From f8ca974091bc7f1877b9fca5009ab372d2e0c935 Mon Sep 17 00:00:00 2001
From: Jason Karns <jason.karns@gmail.com>
Date: Tue, 29 Mar 2016 09:15:33 -0400
Subject: [PATCH 03/40] Fix typo in test

Supposed to be testing include/exclude as empty arrays, not empty objects.
---
 test/core/base/context.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/core/base/context.js b/test/core/base/context.js
index 6c66811ed0..458d6dfc4f 100644
--- a/test/core/base/context.js
+++ b/test/core/base/context.js
@@ -316,8 +316,8 @@ describe('Context', function() {
 
 		});
 
-		it('should default empty-object include to document', function () {
-			var result = new Context({ include: {}, exclude: {} });
+		it('should default empty include to document', function () {
+			var result = new Context({ include: [], exclude: [] });
 			assert.lengthOf(result.include, 1);
 			assert.equal(result.include[0], document);
 		});

From 1701a107a7845eb5f785a9c98f7c51dc7de06e69 Mon Sep 17 00:00:00 2001
From: Takeshi Kurosawa <taken.spc@gmail.com>
Date: Mon, 29 Aug 2016 14:22:33 +0900
Subject: [PATCH 04/40] Fix minor typos in API.md (s/helpURL/helpUrl/)

---
 doc/API.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/API.md b/doc/API.md
index 0de10f4276..8ea8899d56 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -440,7 +440,7 @@ axe.a11yCheck(document, function(results) {
 * `passes[0]`
   ...
   * `help` - `"Elements must have sufficient color contrast"`
-  * `helpURL` - `"https://dequeuniversity.com/courses/html-css/visual-layout/color-contrast"`
+  * `helpUrl` - `"https://dequeuniversity.com/courses/html-css/visual-layout/color-contrast"`
   * `id` - `"color-contrast"`
 		* `nodes`
 			* `target[0]` - `"#js_off-canvas-wrap > .inner-wrap >.kinja-title.proxima.js_kinja-title-desktop"`
@@ -452,7 +452,7 @@ axe.a11yCheck(document, function(results) {
 
 * `violations[0]`
   * `help` - `"<button> elements must have alternate text"`
-  * `helpURL` - `"https://dequeuniversity.com/courses/html-css/forms/form-labels#id84_example_button"`
+  * `helpUrl` - `"https://dequeuniversity.com/courses/html-css/forms/form-labels#id84_example_button"`
   * `id` - `"button-name"`
 		* `nodes`
 			* `target[0]` - `"post_5919997 > .row.content-wrapper > .column > span > iframe"`

From d6a12c4a4b885e9162150a9e23d92e5265524b62 Mon Sep 17 00:00:00 2001
From: Nadav Kavalerchik <nadavkav@gmail.com>
Date: Fri, 2 Sep 2016 14:05:56 +0300
Subject: [PATCH 05/40] Adding AccessLint to the list

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 031bc7cb22..6032457805 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -16,3 +16,4 @@ Add your project/integration to this file and submit a pull request.
 12. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
 13. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
 14. [gulp-axe-core](https://www.npmjs.com/package/gulp-axe-core)
+15. [AccessLint](https://github.com/accesslint/accesslint.js)

From bc805b18e18c8cba30bb0b2afc2c10a445576160 Mon Sep 17 00:00:00 2001
From: Felix Zapata <fzberlinches@gmail.com>
Date: Thu, 8 Sep 2016 09:44:25 +0200
Subject: [PATCH 06/40] docs(projects.md): replace gulp-axe-core with
 gulp-axe-webdriver

---
 doc/projects.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/projects.md b/doc/projects.md
index 6032457805..026e2fb26b 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -15,5 +15,5 @@ Add your project/integration to this file and submit a pull request.
 11. [ReactJS Accessibility Checker](https://github.com/dylanb/react-axe) (react-axe)
 12. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
 13. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
-14. [gulp-axe-core](https://www.npmjs.com/package/gulp-axe-core)
-15. [AccessLint](https://github.com/accesslint/accesslint.js)
+14. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
+15. [AccessLint](https://github.com/accesslint/accesslint.js)
\ No newline at end of file

From 13f372894ab9e7054cb831124035b1b9130ac57c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Mon, 12 Sep 2016 16:51:02 -0700
Subject: [PATCH 07/40] feat: add typescript definition file (#224)

* feat: add typescript definition file

Closes https://github.com/dequelabs/axe-core/issues/183

* doc: update instructions to install TypeScript -g

Also removes TS from package.json

* feat(typescript-def): export types for strings

* test(typescript-def): use axe namespace

Incorporates feedback from https://github.com/dequelabs/axe-core/pull/227.
Add types to tests.
---
 CONTRIBUTING.md                    |  14 +++
 package.json                       |  49 +++++----
 typings/axe-core/axe-core-tests.ts |  91 +++++++++++++++++
 typings/axe-core/axe-core.d.ts     | 159 +++++++++++++++++++++++++++++
 4 files changed, 292 insertions(+), 21 deletions(-)
 create mode 100644 typings/axe-core/axe-core-tests.ts
 create mode 100644 typings/axe-core/axe-core.d.ts

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3a8fd46928..2c95b4c85e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -97,3 +97,17 @@ To build the package:
 ```
 grunt build
 ```
+
+## Using aXe with TypeScript
+
+The TypeScript definition file for axe-core can be found in [typings/axe-core](./typings/axe-core).
+
+To develop with TypeScript you must first install it (globally recommended):
+```
+sudo npm -g install typescript
+```
+
+Once that's installed, you can run TypeScript definition tests (with the optional `--noImplicitAny` flag):
+```
+tsc --noImplicitAny typings/axe-core/axe-core-tests.ts
+```
diff --git a/package.json b/package.json
index 847efe975f..34bf9df54f 100644
--- a/package.json
+++ b/package.json
@@ -3,27 +3,33 @@
   "description": "Accessibility engine for automated Web UI testing",
   "version": "2.0.5",
   "license": "MPL-2.0",
-  "contributors": [{
-    "name": "David Sturley",
-    "organization": "Deque Systems, Inc.",
-    "url": "http://deque.com/"
-  },{
-    "name": "Dylan Barrell",
-    "organization": "Deque Systems, Inc.",
-    "url": "http://deque.com/"
-  },{
-    "name": "Wilco Fiers",
-    "organization": "Deque Systems, Inc.",
-    "url": "http://deque.com/"
-  },{
-    "name": "Dian Fay",
-    "organization": "Deque Systems, Inc.",
-    "url": "http://deque.com/"
-  },{
-    "name": "Marcy Sutton",
-    "organization": "Deque Systems, Inc.",
-    "url": "http://deque.com/"
-  }],
+  "contributors": [
+    {
+      "name": "David Sturley",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Dylan Barrell",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Wilco Fiers",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Dian Fay",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Marcy Sutton",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    }
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/dequelabs/axe-core.git"
@@ -38,6 +44,7 @@
     "aXe"
   ],
   "main": "axe.js",
+  "typings": "./typings/axe-core/axe-core.d.ts",
   "scripts": {
     "build": "grunt",
     "test": "grunt test"
diff --git a/typings/axe-core/axe-core-tests.ts b/typings/axe-core/axe-core-tests.ts
new file mode 100644
index 0000000000..7decb865c2
--- /dev/null
+++ b/typings/axe-core/axe-core-tests.ts
@@ -0,0 +1,91 @@
+/// <reference path="axe-core.d.ts" />
+
+var context:any = document
+var $fixture:any = {}
+
+// axe.a11yCheck config
+axe.a11yCheck(context, {}, (results) => {
+	// axe's results object
+	console.log(results.passes.length)
+	console.log(results.violations.length)
+});
+// axe.a11yCheck include/exclude
+axe.a11yCheck({include: [['#id1'], ['#id2']]}, {}, (results) => {
+	console.log(results)
+})
+axe.a11yCheck({exclude: [$fixture[0]]}, {}, (results) => {
+	console.log(results)
+})
+var tagConfigRunOnly: axe.RunOnly = {
+	type: 'tag',
+	values: ['wcag2a']
+}
+var tagConfig = {
+	runOnly: tagConfigRunOnly
+}
+axe.a11yCheck(context, tagConfig, (results) => {
+	console.log(results)
+})
+var includeExcludeTagsRunOnly: axe.RunOnly = {
+	type: 'tags',
+	value: {
+		include: ['wcag2a', 'wcag2aa'],
+		exclude: ['experimental']
+	}
+}
+var includeExcludeTagsConfig = {
+	runOnly: includeExcludeTagsRunOnly
+}
+axe.a11yCheck(context, includeExcludeTagsConfig, (results) => {
+	console.log(results)
+})
+var someRulesConfig = {
+	rules: {
+		"color-contrast": {enabled: 'false'},
+		"heading-order": {enabled: 'true'}
+	}
+}
+axe.a11yCheck(context, someRulesConfig, (results) => {
+	console.log(results)
+})
+
+// axe.configure
+var spec: axe.Spec = {
+	branding: {
+		brand: 'foo',
+		application: 'bar'
+	},
+	reporter: 'v1',
+	checks: [{
+		id: 'custom-check',
+		evaluate: function() {
+			return true
+		}
+	}],
+	rules: [{
+		id: 'custom-rule',
+		any: ['custom-check']
+	}]
+}
+axe.configure(spec)
+
+axe.reset()
+
+axe.getRules(['wcag2aa'])
+typeof axe.getRules() === 'object'
+
+// Plugins
+var pluginSrc: axe.AxePlugin = {
+	id: 'doStuff',
+	run: (data:any, callback:Function) => {
+		callback()
+	},
+	commands: [{
+		id: 'run-doStuff',
+		callback: (data:any, callback:Function) => {
+			axe.plugins['doStuff'].run(data, callback)
+		}
+	}]
+}
+axe.registerPlugin(pluginSrc)
+axe.cleanup()
diff --git a/typings/axe-core/axe-core.d.ts b/typings/axe-core/axe-core.d.ts
new file mode 100644
index 0000000000..98818e75cc
--- /dev/null
+++ b/typings/axe-core/axe-core.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for axe-core 2.0.5
+// Project: https://github.com/dequelabs/axe-core
+// Definitions by: Marcy Sutton <https://github.com/marcysutton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace axe {
+
+	export type ImpactValue = "minor" | "moderate" | "serious" | "critical";
+
+	export type TagValue = "wcag2a" | "wcag2aa" | "section508" | "best-practice";
+
+	export type ReporterVersion = "v1" | "v2";
+
+	export type RunOnlyType = "rule" | "rules" | "tag" | "tags";
+
+	export interface ElementContext {
+		node?: Object,
+		selector?: string,
+		include?: any[],
+		exclude?: any[]
+	}
+	export interface RunOnly {
+		type: RunOnlyType,
+		value?: {
+			include?: string[],
+			exclude?: string[]
+		}
+		values?: TagValue[]
+	}
+	export interface AxeResults {
+		url: string,
+		timestamp: string,
+		passes: Pass[],
+		violations: Violation[]
+	}
+	export interface Pass {
+		description: string,
+		help: string,
+		helpUrl: string,
+		id: string,
+		impact: ImpactValue,
+		tags: TagValue[],
+		nodes: NodeResult[]
+	}
+	export interface Violation {
+		description: string,
+		help: string,
+		helpUrl: string,
+		id: string,
+		impact: ImpactValue,
+		tags: TagValue[],
+		nodes: NodeResult[]
+	}
+	export interface NodeResult {
+		html: string,
+		impact: ImpactValue,
+		target: string[],
+		any: CheckResult[],
+		all: CheckResult[],
+		none: CheckResult[]
+	}
+	export interface CheckResult {
+		id: string,
+		impact: string,
+		message: string,
+		data: any,
+		relatedNodes?: RelatedNode[]
+	}
+	export interface RelatedNode {
+		target: string[],
+		html: string
+	}
+	export interface Spec {
+		branding?: {
+			brand: string,
+			application: string
+		},
+		reporter?: ReporterVersion,
+		checks?: Check[],
+		rules?: Rule[]
+	}
+	export interface Check {
+		id: string,
+		evaluate: Function,
+		after?: Function,
+		options?: any,
+		matches?: string,
+		enabled?: boolean
+	}
+	export interface Rule {
+		id: string,
+		selector?: string,
+		excludeHidden?: boolean,
+		enabled?: boolean,
+		pageLevel?: boolean,
+		any?: string[],
+		all?: string[],
+		none?: string[],
+		tags?: string[],
+		matches?: string
+	}
+	export interface AxePlugin {
+		id: string,
+		run(...args:any[]): any,
+		commands: {
+			id: string,
+			callback(...args:any[]): void
+		}[],
+		cleanup?(callback:Function): void
+	}
+
+	export let plugins: any
+
+	/**
+	 * Starts analysis on the current document and its subframes
+	 *
+	 * @param  {Object}   context  The `Context` specification object @see Context
+	 * @param  {Array}    options  Options passed into rules or checks, temporarily modifyint them.
+	 * @param  {Function} callback The function to invoke when analysis is complete.
+	 * @returns {Object}  results  The aXe results object
+	 */
+	export function a11yCheck(context: ElementContext, options: {runOnly?: RunOnly, rules?: Object}, callback: (results:AxeResults) => void): AxeResults
+
+	/**
+	 * Method for configuring the data format used by aXe. Helpful for adding new
+	 * rules, which must be registered with the library to execute.
+	 * @param  {Spec}       Spec Object with valid `branding`, `reporter`, `checks` and `rules` data
+	 */
+	export function configure(spec: Spec): void
+
+	/**
+	 * Searches and returns rules that contain a tag in the list of tags.
+	 * @param  {Array}  tags  Optional array of tags
+	 * @return {Array}  Array of rules
+	 */
+	export function getRules(tags?: string[]): Object[]
+
+	/**
+	 * Restores the default axe configuration
+	 */
+	export function reset(): void
+
+	/**
+	 * Function to register a plugin configuration in document and its subframes
+	 * @param  {Object}    plugin    A plugin configuration object
+	 */
+	export function registerPlugin(plugin: AxePlugin): void
+
+	/**
+	 * Function to clean up plugin configuration in document and its subframes
+	 */
+	export function cleanup(): void
+
+}
+
+// axe is also available as a module
+declare module "axe-core" {
+    export = axe;
+}

From ad46dd506c8134d02717fc8975f615794f03f492 Mon Sep 17 00:00:00 2001
From: Stephen Donner <stephen.donner@gmail.com>
Date: Wed, 14 Sep 2016 14:39:17 -0700
Subject: [PATCH 08/40] doc: fix a few typos (#228)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 08611c536e..79027950cf 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ We believe that automated testing has an important role to play in achieving dig
 
 ## Manifesto
 
-1. Automated accessibility testing rules must have a zero false positive rate
+1. Automated accessibility testing rules must have a zero false-positive rate
 2. Automated accessibility testing rules must be lightweight and fast
 3. Automated accessibility testing rules must work in all modern browsers
 4. Automated accessibility testing rules must, themselves, be tested automatically
@@ -44,7 +44,7 @@ First download the package:
 npm install axe-core --save-dev
 ```
 
-Now include the javascript file in each of your iframes in you fixtures or test systems:
+Now include the javascript file in each of your iframes in your fixtures or test systems:
 
 ```html
 <script src="node_modules/axe-core/axe.min.js" ></script>
@@ -76,7 +76,7 @@ The complete list of rules run by axe-core can be found in [doc/rule-description
 
 The [aXe API](doc/API.md) package consists of:
 
-* `axe.js` - the javascript file that should be included in your web site under test (API)
+* `axe.js` - the JavaScript file that should be included in your web site under test (API)
 * `axe.min.js` - a minified version of the above file
 
 

From a4a55f8ce03f881e127e3c4032ab9dc3d836bed1 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 20 Sep 2016 10:54:06 -0700
Subject: [PATCH 09/40] test(typescript-def): add source and AxeResults

---
 typings/axe-core/axe-core-tests.ts | 14 ++++++++------
 typings/axe-core/axe-core.d.ts     | 10 ++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/typings/axe-core/axe-core-tests.ts b/typings/axe-core/axe-core-tests.ts
index 7decb865c2..2b8195d753 100644
--- a/typings/axe-core/axe-core-tests.ts
+++ b/typings/axe-core/axe-core-tests.ts
@@ -4,16 +4,16 @@ var context:any = document
 var $fixture:any = {}
 
 // axe.a11yCheck config
-axe.a11yCheck(context, {}, (results) => {
+axe.a11yCheck(context, {}, (results: axe.AxeResults) => {
 	// axe's results object
 	console.log(results.passes.length)
 	console.log(results.violations.length)
 });
 // axe.a11yCheck include/exclude
-axe.a11yCheck({include: [['#id1'], ['#id2']]}, {}, (results) => {
+axe.a11yCheck({include: [['#id1'], ['#id2']]}, {}, (results: axe.AxeResults) => {
 	console.log(results)
 })
-axe.a11yCheck({exclude: [$fixture[0]]}, {}, (results) => {
+axe.a11yCheck({exclude: [$fixture[0]]}, {}, (results: axe.AxeResults) => {
 	console.log(results)
 })
 var tagConfigRunOnly: axe.RunOnly = {
@@ -23,7 +23,7 @@ var tagConfigRunOnly: axe.RunOnly = {
 var tagConfig = {
 	runOnly: tagConfigRunOnly
 }
-axe.a11yCheck(context, tagConfig, (results) => {
+axe.a11yCheck(context, tagConfig, (results: axe.AxeResults) => {
 	console.log(results)
 })
 var includeExcludeTagsRunOnly: axe.RunOnly = {
@@ -36,7 +36,7 @@ var includeExcludeTagsRunOnly: axe.RunOnly = {
 var includeExcludeTagsConfig = {
 	runOnly: includeExcludeTagsRunOnly
 }
-axe.a11yCheck(context, includeExcludeTagsConfig, (results) => {
+axe.a11yCheck(context, includeExcludeTagsConfig, (results: axe.AxeResults) => {
 	console.log(results)
 })
 var someRulesConfig = {
@@ -45,7 +45,7 @@ var someRulesConfig = {
 		"heading-order": {enabled: 'true'}
 	}
 }
-axe.a11yCheck(context, someRulesConfig, (results) => {
+axe.a11yCheck(context, someRulesConfig, (results: axe.AxeResults) => {
 	console.log(results)
 })
 
@@ -69,6 +69,8 @@ var spec: axe.Spec = {
 }
 axe.configure(spec)
 
+var source = axe.source;
+
 axe.reset()
 
 axe.getRules(['wcag2aa'])
diff --git a/typings/axe-core/axe-core.d.ts b/typings/axe-core/axe-core.d.ts
index 98818e75cc..f22bf27f43 100644
--- a/typings/axe-core/axe-core.d.ts
+++ b/typings/axe-core/axe-core.d.ts
@@ -111,6 +111,16 @@ declare namespace axe {
 
 	export let plugins: any
 
+	/**
+	 * Source string to use as an injected script in Selenium
+	 */
+	export let source: string
+
+	/**
+	 * Object for aXe Results
+	 */
+	export var AxeResults: AxeResults
+
 	/**
 	 * Starts analysis on the current document and its subframes
 	 *

From 957d68e5be73689e7936220ca00011c1e96a6957 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 28 Sep 2016 12:08:45 +0100
Subject: [PATCH 10/40] bump version to 2.0.6 for TypeScript definition

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34bf9df54f..c0acee503c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "license": "MPL-2.0",
   "contributors": [
     {

From 71f66e5af9a553f2660039cab339d902ebb0489d Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 28 Sep 2016 12:31:25 +0100
Subject: [PATCH 11/40] bump version to 2.0.7 to fix release issue

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0acee503c..90eeb162bd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "license": "MPL-2.0",
   "contributors": [
     {

From cf8531b7285635d7fad9fa5a86cd91cb85848a7c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Sun, 2 Oct 2016 09:58:10 -0700
Subject: [PATCH 12/40] fix(typescript-def): move definition to root

Fixes import in Angular 2 apps when distributed through npm instead of DefinitelyTyped. Keeping TypeScript export as-is to support a wider variety of compiler versions, but allowing direct import instead of an ambient module.

TypeScript usage: `import * as axe from 'axe-core'`
---
 .gitignore                                 |  1 +
 .npmignore                                 |  1 +
 typings/axe-core/axe-core.d.ts => axe.d.ts | 10 +++-------
 package.json                               |  2 +-
 typings/axe-core/axe-core-tests.ts         |  2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)
 rename typings/axe-core/axe-core.d.ts => axe.d.ts (94%)

diff --git a/.gitignore b/.gitignore
index e3c3064080..b24bda9620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ axe.min.js
 axe.es2016.js
 *.tgz
 npm-shrinkwrap.json
+typings/axe-core/axe-core-tests.js
diff --git a/.npmignore b/.npmignore
index ccca960058..c74e12cad0 100644
--- a/.npmignore
+++ b/.npmignore
@@ -6,3 +6,4 @@ lib
 test
 *.tgz
 bower.json
+typings/axe-core
diff --git a/typings/axe-core/axe-core.d.ts b/axe.d.ts
similarity index 94%
rename from typings/axe-core/axe-core.d.ts
rename to axe.d.ts
index f22bf27f43..7c5ea81be5 100644
--- a/typings/axe-core/axe-core.d.ts
+++ b/axe.d.ts
@@ -1,9 +1,8 @@
-// Type definitions for axe-core 2.0.5
+// Type definitions for axe-core 2.0.8
 // Project: https://github.com/dequelabs/axe-core
 // Definitions by: Marcy Sutton <https://github.com/marcysutton>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace axe {
+declare module axe {
 
 	export type ImpactValue = "minor" | "moderate" | "serious" | "critical";
 
@@ -163,7 +162,4 @@ declare namespace axe {
 
 }
 
-// axe is also available as a module
-declare module "axe-core" {
-    export = axe;
-}
+export = axe;
diff --git a/package.json b/package.json
index 90eeb162bd..2d36411913 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "aXe"
   ],
   "main": "axe.js",
-  "typings": "./typings/axe-core/axe-core.d.ts",
+  "typings": "axe.d.ts",
   "scripts": {
     "build": "grunt",
     "test": "grunt test"
diff --git a/typings/axe-core/axe-core-tests.ts b/typings/axe-core/axe-core-tests.ts
index 2b8195d753..1889b37dea 100644
--- a/typings/axe-core/axe-core-tests.ts
+++ b/typings/axe-core/axe-core-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="axe-core.d.ts" />
+import * as axe from '../../axe'
 
 var context:any = document
 var $fixture:any = {}

From 474d49c3532ad8cfbec6839f7f6f1921210bcf05 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Thu, 13 Oct 2016 10:01:43 -0400
Subject: [PATCH 13/40] Update projects.md

---
 doc/projects.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/projects.md b/doc/projects.md
index 026e2fb26b..3646a72d3b 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -16,4 +16,5 @@ Add your project/integration to this file and submit a pull request.
 12. [Vorlon.js Remote Debugger](https://github.com/MicrosoftDX/Vorlonjs)
 13. [Selenium IDE aXe Extension](https://github.com/bkardell/selenium-ide-axe)
 14. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
-15. [AccessLint](https://github.com/accesslint/accesslint.js)
\ No newline at end of file
+15. [AccessLint](https://github.com/accesslint/accesslint.js)
+16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)

From 7b54ba0977cb50692550698a5c338645213ac2cc Mon Sep 17 00:00:00 2001
From: Ryan Ponce <ryanponce@gmail.com>
Date: Wed, 26 Oct 2016 17:42:29 -0700
Subject: [PATCH 14/40] Update syntax highlighting in Readme (#245)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79027950cf..bc391c2060 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Now include the javascript file in each of your iframes in your fixtures or test
 
 Now insert calls at each point in your tests where a new piece of UI becomes visible or exposed:
 
-```
+```js
 axe.a11yCheck(document, function (results) {
     ok(results.violations.length === 0, 'Should be no accessibility issues');
     // complete the async call

From b1a8a87287a004e040696d2441ed314f4d85c784 Mon Sep 17 00:00:00 2001
From: Sarbbottam Bandyopadhyay <sarbbottam@gmail.com>
Date: Tue, 1 Nov 2016 17:52:26 -0700
Subject: [PATCH 15/40] chore(deps): added grunt-cli as devDependencies

so that global grunt-cli installation is not required
---
 .travis.yml  | 4 +---
 package.json | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15d03aa04d..7e13f9874c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,10 @@ node_js:
   - '4'
   - '5'
 before_install:
-  - npm install -g grunt-cli
-  - npm install
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
-  - grunt test
+  - npm test
 env:
   global:
     - secure: qjMwfcWDzEhGWxVhmGi5s0MlsU4N/SI96mx6Gj36/GySxgIUU9EFXeN4SZS2OvRmy2/+l0XSt5ln9PWp4Suh2LM8/GaR5I6FALs/9rOLU9py0/G9V1ImqNN9Z6Nk6PvS71SAwP7xOtR+xsywnUEdHZ7dCA3fYEIsOkyq4KRQ9M7JHWogP+h+WsHPcznjPeNxVBCfYCXW0KhrLDzL4ZA+b2UY/IMZDXITdZ99TZQA6XSKTfJg3xs/jqXEo91igHNKN6VxappBqPbDiFxf7az1RExq3oHAawCDTaKE7xxip+6UIxAeo63tiM0vgp92HVrVsIQETSQFBP4aqhl/pfxQ7d9lto7Mz5AlxKvJ3CIwDD/hspPzG5SNrj/FgQLgK7LrUOomMOjf8giRUg8XXLe7Rb1jmbePP3Z9DIEg4Z+ar3dpC2dNiWYFwBM14wY39GuU6tJpzImGRRUGCMPiO55TVTdRZacVeIq1XWRecIH0CabZThJCwOxyiGIT5ETiT5CVs0CgnbVe99l1qyi8wrMnbw4m4UAlMQ/5kytqtsL957RwxvcctCtX+LlshAgC3m1Aq/aF8V/wIYDcRlwOY2HbGiFQJewV7Aeln3t/S8VFjP9hHn8ZTsH9ez3VB57Q53YgrxFCr6CXEK4X3dkmRpx9in3oDI51TxW32tInwGTukSg=
diff --git a/package.json b/package.json
index 2d36411913..ea3318887f 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "dot": "~1.0.3",
     "grunt": "~0.4.5",
     "grunt-babel": "^6.0.0",
+    "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "~1.0.0",
     "grunt-contrib-concat": "~1.0.0",
     "grunt-contrib-connect": "~1.0.1",

From b74ff003a3a40f25eca870fd5f520ebf3ff231f8 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Fri, 4 Nov 2016 20:38:32 +0200
Subject: [PATCH 16/40] Update projects.md

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 3646a72d3b..165f95c3d2 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -18,3 +18,4 @@ Add your project/integration to this file and submit a pull request.
 14. [gulp-axe-webdriver](https://github.com/felixzapata/gulp-axe-webdriver)
 15. [AccessLint](https://github.com/accesslint/accesslint.js)
 16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
+17. [Axegrinder](https://github.com/claflamme/axegrinder)

From 945c35f50c57dcc2f2d6ce5e857f4fdb9d1d5aa6 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 5 Nov 2016 09:18:47 +0200
Subject: [PATCH 17/40] Update projects.md

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 165f95c3d2..64bd1afb71 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -19,3 +19,4 @@ Add your project/integration to this file and submit a pull request.
 15. [AccessLint](https://github.com/accesslint/accesslint.js)
 16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
 17. [Axegrinder](https://github.com/claflamme/axegrinder)
+18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)

From 13732e33f5ff9694b6ec05746318cf7b4ee645e9 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 12 Nov 2016 15:26:24 +0200
Subject: [PATCH 18/40] add all missing implicit roles from HTML 5

---
 lib/commons/aria/index.js        | 85 +++++++++++++++++++++-----------
 test/checks/aria/allowed-attr.js |  2 +-
 2 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index d626643871..cb219285e7 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -200,7 +200,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['header']
 	},
 	'button': {
 		type: 'widget',
@@ -210,7 +211,7 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author', 'contents'],
 		context: null,
-		implicit: ['button', 'input[type="button"]', 'input[type="image"]']
+		implicit: ['button', 'input[type="button"]', 'input[type="image"]', 'input[type="reset"]', 'input[type="submit"]', 'summary']
 	},
 	'cell': {
 		type: 'structure',
@@ -219,7 +220,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['row']
+		context: ['row'],
+		implicit: ['td', 'th']
 	},
 	'checkbox': {
 		type: 'widget',
@@ -238,7 +240,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['row']
+		context: ['row'],
+		implicit: ['th']
 	},
 	'combobox': {
 		type: 'composite',
@@ -277,7 +280,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['footer']
 	},
 	'definition': {
 		type: 'structure',
@@ -286,7 +290,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['dd']
 	},
 	'dialog': {
 		type: 'widget',
@@ -324,7 +329,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['form']
 	},
 	'grid': {
 		type: 'composite',
@@ -335,7 +341,8 @@ lookupTables.role = {
 			one: ['rowgroup', 'row']
 		},
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['table']
 	},
 	'gridcell': {
 		type: 'widget',
@@ -344,7 +351,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['row']
+		context: ['row'],
+		implicit: ['td', 'th']
 	},
 	'group': {
 		type: 'structure',
@@ -354,7 +362,7 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author'],
 		context: null,
-		implicit: ['details']
+		implicit: ['details', 'optgroup']
 	},
 	'heading': {
 		type: 'structure',
@@ -404,7 +412,7 @@ lookupTables.role = {
 		},
 		nameFrom: ['author'],
 		context: null,
-		implicit: ['ol', 'ul']
+		implicit: ['ol', 'ul', 'dl']
 	},
 	'listbox': {
 		type: 'composite',
@@ -426,7 +434,7 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author', 'contents'],
 		context: ['list'],
-		implicit: ['li']
+		implicit: ['li', 'dt']
 	},
 	'log': {
 		type: 'widget',
@@ -444,7 +452,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['main']
 	},
 	'marquee': {
 		type: 'widget',
@@ -462,7 +471,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['math']
 	},
 	'menu': {
 		type: 'composite',
@@ -473,7 +483,8 @@ lookupTables.role = {
 			one: ['menuitem', 'menuitemradio', 'menuitemcheckbox']
 		},
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['menu[type="context"]']
 	},
 	'menubar': {
 		type: 'composite',
@@ -489,7 +500,8 @@ lookupTables.role = {
 		attributes: null,
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['menu', 'menubar']
+		context: ['menu', 'menubar'],
+		implicit: ['menuitem[type="command"]']
 	},
 	'menuitemcheckbox': {
 		type: 'widget',
@@ -498,7 +510,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['menu', 'menubar']
+		context: ['menu', 'menubar'],
+		implicit: ['menuitem[type="checkbox"]']
 	},
 	'menuitemradio': {
 		type: 'widget',
@@ -508,7 +521,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['menu', 'menubar']
+		context: ['menu', 'menubar'],
+		implicit: ['menuitem[type="radio"]']
 	},
 	'navigation': {
 		type: 'landmark',
@@ -517,14 +531,16 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['nav']
 	},
 	'none': {
 		type: 'structure',
 		attributes: null,
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['div', 'span']
 	},
 	'note': {
 		type: 'structure',
@@ -542,14 +558,16 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['listbox']
+		context: ['listbox'],
+		implicit: ['option']
 	},
 	'presentation': {
 		type: 'structure',
 		attributes: null,
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['div', 'span']
 	},
 	'progressbar': {
 		type: 'widget',
@@ -558,7 +576,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['progress']
 	},
 	'radio': {
 		type: 'widget',
@@ -608,7 +627,8 @@ lookupTables.role = {
 			one: ['cell', 'columnheader', 'rowheader', 'gridcell']
 		},
 		nameFrom: ['author', 'contents'],
-		context:  ['rowgroup', 'grid', 'treegrid', 'table']
+		context:  ['rowgroup', 'grid', 'treegrid', 'table'],
+		implicit: ['tr']
 	},
 	'rowgroup': {
 		type: 'structure',
@@ -619,7 +639,8 @@ lookupTables.role = {
 			all: ['row']
 		},
 		nameFrom: ['author', 'contents'],
-		context:  ['grid', 'table']
+		context:  ['grid', 'table'],
+		implicit: ['tbody', 'thead', 'tfoot']
 	},
 	'rowheader': {
 		type: 'structure',
@@ -628,7 +649,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author', 'contents'],
-		context: ['row']
+		context: ['row'],
+		implicit: ['th']
 	},
 	'scrollbar': {
 		type: 'widget',
@@ -678,7 +700,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['hr']
 	},
 	'slider': {
 		type: 'widget',
@@ -688,7 +711,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['input[type="range"]']
 	},
 	'spinbutton': {
 		type: 'widget',
@@ -698,7 +722,8 @@ lookupTables.role = {
 		},
 		owned: null,
 		nameFrom: ['author'],
-		context: null
+		context: null,
+		implicit: ['input[type="number"]']
 	},
 	'status': {
 		type: 'widget',
@@ -777,7 +802,7 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author'],
 		context: null,
-		implicit: ['input[type="text"]', 'input:not([type])']
+		implicit: ['input[type="text"]', 'input[type="email"]', 'input[type="password"]', 'input[type="tel"]', 'input[type="url"]', 'input:not([type])', 'textarea']
 	},
 	'timer': {
 		type: 'widget',
diff --git a/test/checks/aria/allowed-attr.js b/test/checks/aria/allowed-attr.js
index 17f418c4c1..3816d2f343 100644
--- a/test/checks/aria/allowed-attr.js
+++ b/test/checks/aria/allowed-attr.js
@@ -57,7 +57,7 @@ describe('aria-allowed-attr', function () {
 	});
 
 	it('should return true if there is no role', function () {
-		var node = document.createElement('div');
+		var node = document.createElement('picture');
 		node.id = 'test';
 		node.tabIndex = 1;
 		node.setAttribute('aria-selected', 'true');

From 7aacc39248c1db5f7629cd4739c6130057cce4ce Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 12 Nov 2016 15:34:46 +0200
Subject: [PATCH 19/40] move linting to beginning of the build and fix linting
 issues

---
 Gruntfile.js              | 4 ++--
 lib/commons/aria/index.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 8cec1bc022..3e1134c49c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -234,14 +234,14 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('default', ['build']);
 
-	grunt.registerTask('build', ['clean', 'validate', 'concat:commons', 'configure',
+	grunt.registerTask('build', ['clean', 'jshint', 'validate', 'concat:commons', 'configure',
 		 'babel', 'concat:engine', 'uglify']);
 
 	grunt.registerTask('test', ['build', 'testconfig', 'fixture', 'connect',
 		'mocha', 'jshint']);
 
 	grunt.registerTask('test-browser', ['build',  'testconfig', 'fixture', 'connect',
-		'test-webdriver', 'jshint']);
+		'test-webdriver']);
 
 
 	grunt.registerTask('dev', ['build', 'testconfig', 'fixture', 'connect', 'watch']);
diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index cb219285e7..2f4863bd5d 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -802,7 +802,9 @@ lookupTables.role = {
 		owned: null,
 		nameFrom: ['author'],
 		context: null,
-		implicit: ['input[type="text"]', 'input[type="email"]', 'input[type="password"]', 'input[type="tel"]', 'input[type="url"]', 'input:not([type])', 'textarea']
+		implicit: ['input[type="text"]', 'input[type="email"]',
+			'input[type="password"]', 'input[type="tel"]',
+			'input[type="url"]', 'input:not([type])', 'textarea']
 	},
 	'timer': {
 		type: 'widget',

From cab926fe2647f7eaf44c85c1ac0c8391ba378e61 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 12 Nov 2016 16:22:17 +0200
Subject: [PATCH 20/40] add test for implicit role

---
 test/integration/rules/aria-allowed-attr/passes.html | 1 +
 test/integration/rules/aria-allowed-attr/passes.json | 2 +-
 test/mock/frames/recursive.html                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
index 4440be3fcf..f8187f9dfa 100644
--- a/test/integration/rules/aria-allowed-attr/passes.html
+++ b/test/integration/rules/aria-allowed-attr/passes.html
@@ -65,3 +65,4 @@
 <div role="searchbox" id="pass62" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="text" id="pass63" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="table" id="pass64" aria-colcount="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+<input type="reset" id="pass65" value="Reset" aria-pressed="true"/>
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
index 2a433fe638..d7beec65bf 100644
--- a/test/integration/rules/aria-allowed-attr/passes.json
+++ b/test/integration/rules/aria-allowed-attr/passes.json
@@ -11,6 +11,6 @@
 		["#pass43"], ["#pass44"], ["#pass45"], ["#pass46"], ["#pass47"], ["#pass48"], ["#pass49"],
 		["#pass50"], ["#pass51"], ["#pass52"], ["#pass53"], ["#pass54"], ["#pass55"], ["#pass56"],
 		["#pass57"], ["#pass58"], ["#pass59"], ["#pass60"], ["#pass61"], ["#pass62"], ["#pass63"],
-		["#pass64"]
+		["#pass64"], ["#pass65"]
 	]
 }
\ No newline at end of file
diff --git a/test/mock/frames/recursive.html b/test/mock/frames/recursive.html
index 77430a5b88..acd088068c 100644
--- a/test/mock/frames/recursive.html
+++ b/test/mock/frames/recursive.html
@@ -21,6 +21,6 @@
 </head>
 <body>
 	<h1>Recursive iframe</h1>
-	<iframe src="recursive.html">
+	<iframe src="nested1.html">
 </body>
 </html>

From c3e5253bfa2a3de530e64a1642bf0b9cbf63ff15 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 12 Nov 2016 16:22:17 +0200
Subject: [PATCH 21/40] add tests for implicit roles

---
 test/checks/aria/required-children.js                | 12 ++++++++++++
 test/integration/rules/aria-allowed-attr/passes.html |  1 +
 test/integration/rules/aria-allowed-attr/passes.json |  2 +-
 test/mock/frames/recursive.html                      |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index d3aa28bcb0..57cdb5046c 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -73,6 +73,18 @@ describe('aria-required-children', function () {
 		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
 	});
 
+	it('should pass one existing required child when one required because of implicit role', function () {
+		fixture.innerHTML = '<table id="target"><p role="row">Nothing here.</p></table>';
+		var node = fixture.querySelector('#target');
+		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+	});
+
+	it('should pass when a child with an implicit role is present', function () {
+		fixture.innerHTML = '<table role="grid" id="target"><tr><td>Nothing here.</td></tr></table>';
+		var node = fixture.querySelector('#target');
+		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+	});
+
 	it('should pass direct existing required children', function () {
 		fixture.innerHTML = '<div role="list" id="target"><p role="listitem">Nothing here.</p></div>';
 		var node = fixture.querySelector('#target');
diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
index 4440be3fcf..f8187f9dfa 100644
--- a/test/integration/rules/aria-allowed-attr/passes.html
+++ b/test/integration/rules/aria-allowed-attr/passes.html
@@ -65,3 +65,4 @@
 <div role="searchbox" id="pass62" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="text" id="pass63" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="table" id="pass64" aria-colcount="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+<input type="reset" id="pass65" value="Reset" aria-pressed="true"/>
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
index 2a433fe638..d7beec65bf 100644
--- a/test/integration/rules/aria-allowed-attr/passes.json
+++ b/test/integration/rules/aria-allowed-attr/passes.json
@@ -11,6 +11,6 @@
 		["#pass43"], ["#pass44"], ["#pass45"], ["#pass46"], ["#pass47"], ["#pass48"], ["#pass49"],
 		["#pass50"], ["#pass51"], ["#pass52"], ["#pass53"], ["#pass54"], ["#pass55"], ["#pass56"],
 		["#pass57"], ["#pass58"], ["#pass59"], ["#pass60"], ["#pass61"], ["#pass62"], ["#pass63"],
-		["#pass64"]
+		["#pass64"], ["#pass65"]
 	]
 }
\ No newline at end of file
diff --git a/test/mock/frames/recursive.html b/test/mock/frames/recursive.html
index 77430a5b88..acd088068c 100644
--- a/test/mock/frames/recursive.html
+++ b/test/mock/frames/recursive.html
@@ -21,6 +21,6 @@
 </head>
 <body>
 	<h1>Recursive iframe</h1>
-	<iframe src="recursive.html">
+	<iframe src="nested1.html">
 </body>
 </html>

From 7104d19c03fb2f2f375e364d27a64f07aa42c7c0 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Sat, 12 Nov 2016 16:22:17 +0200
Subject: [PATCH 22/40] add tests for implicit roles

---
 lib/commons/aria/index.js                            |  6 ++----
 test/checks/aria/allowed-attr.js                     |  2 +-
 test/checks/aria/required-children.js                | 12 ++++++++++++
 test/integration/rules/aria-allowed-attr/passes.html |  1 +
 test/integration/rules/aria-allowed-attr/passes.json |  2 +-
 test/mock/frames/recursive.html                      |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/commons/aria/index.js b/lib/commons/aria/index.js
index 2f4863bd5d..29d1b44af5 100644
--- a/lib/commons/aria/index.js
+++ b/lib/commons/aria/index.js
@@ -539,8 +539,7 @@ lookupTables.role = {
 		attributes: null,
 		owned: null,
 		nameFrom: ['author'],
-		context: null,
-		implicit: ['div', 'span']
+		context: null
 	},
 	'note': {
 		type: 'structure',
@@ -566,8 +565,7 @@ lookupTables.role = {
 		attributes: null,
 		owned: null,
 		nameFrom: ['author'],
-		context: null,
-		implicit: ['div', 'span']
+		context: null
 	},
 	'progressbar': {
 		type: 'widget',
diff --git a/test/checks/aria/allowed-attr.js b/test/checks/aria/allowed-attr.js
index 3816d2f343..17f418c4c1 100644
--- a/test/checks/aria/allowed-attr.js
+++ b/test/checks/aria/allowed-attr.js
@@ -57,7 +57,7 @@ describe('aria-allowed-attr', function () {
 	});
 
 	it('should return true if there is no role', function () {
-		var node = document.createElement('picture');
+		var node = document.createElement('div');
 		node.id = 'test';
 		node.tabIndex = 1;
 		node.setAttribute('aria-selected', 'true');
diff --git a/test/checks/aria/required-children.js b/test/checks/aria/required-children.js
index d3aa28bcb0..57cdb5046c 100644
--- a/test/checks/aria/required-children.js
+++ b/test/checks/aria/required-children.js
@@ -73,6 +73,18 @@ describe('aria-required-children', function () {
 		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
 	});
 
+	it('should pass one existing required child when one required because of implicit role', function () {
+		fixture.innerHTML = '<table id="target"><p role="row">Nothing here.</p></table>';
+		var node = fixture.querySelector('#target');
+		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+	});
+
+	it('should pass when a child with an implicit role is present', function () {
+		fixture.innerHTML = '<table role="grid" id="target"><tr><td>Nothing here.</td></tr></table>';
+		var node = fixture.querySelector('#target');
+		assert.isTrue(checks['aria-required-children'].evaluate.call(checkContext, node));
+	});
+
 	it('should pass direct existing required children', function () {
 		fixture.innerHTML = '<div role="list" id="target"><p role="listitem">Nothing here.</p></div>';
 		var node = fixture.querySelector('#target');
diff --git a/test/integration/rules/aria-allowed-attr/passes.html b/test/integration/rules/aria-allowed-attr/passes.html
index 4440be3fcf..f8187f9dfa 100644
--- a/test/integration/rules/aria-allowed-attr/passes.html
+++ b/test/integration/rules/aria-allowed-attr/passes.html
@@ -65,3 +65,4 @@
 <div role="searchbox" id="pass62" aria-activedescendant="value" aria-autocomplete="value" aria-multiline="value" aria-readonly="value" aria-required="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="text" id="pass63" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
 <div role="table" id="pass64" aria-colcount="value" aria-rowcount="value" aria-atomic="value" aria-busy="value" aria-controls="value" aria-describedby="value" aria-disabled="value" aria-dropeffect="value" aria-flowto="value" aria-grabbed="value" aria-haspopup="value" aria-hidden="value" aria-invalid="value" aria-label="value" aria-labelledby="value" aria-live="value" aria-owns="value" aria-relevant="value">ok</div>
+<input type="reset" id="pass65" value="Reset" aria-pressed="true"/>
diff --git a/test/integration/rules/aria-allowed-attr/passes.json b/test/integration/rules/aria-allowed-attr/passes.json
index 2a433fe638..d7beec65bf 100644
--- a/test/integration/rules/aria-allowed-attr/passes.json
+++ b/test/integration/rules/aria-allowed-attr/passes.json
@@ -11,6 +11,6 @@
 		["#pass43"], ["#pass44"], ["#pass45"], ["#pass46"], ["#pass47"], ["#pass48"], ["#pass49"],
 		["#pass50"], ["#pass51"], ["#pass52"], ["#pass53"], ["#pass54"], ["#pass55"], ["#pass56"],
 		["#pass57"], ["#pass58"], ["#pass59"], ["#pass60"], ["#pass61"], ["#pass62"], ["#pass63"],
-		["#pass64"]
+		["#pass64"], ["#pass65"]
 	]
 }
\ No newline at end of file
diff --git a/test/mock/frames/recursive.html b/test/mock/frames/recursive.html
index 77430a5b88..acd088068c 100644
--- a/test/mock/frames/recursive.html
+++ b/test/mock/frames/recursive.html
@@ -21,6 +21,6 @@
 </head>
 <body>
 	<h1>Recursive iframe</h1>
-	<iframe src="recursive.html">
+	<iframe src="nested1.html">
 </body>
 </html>

From df3f94c35ee66d769193f2d7aa5ec3a4d9a524cb Mon Sep 17 00:00:00 2001
From: Christoffer Klang <christoffer@dropbox.com>
Date: Wed, 16 Nov 2016 10:05:48 +0100
Subject: [PATCH 23/40] Defer resolving node selectors until needed

---
 lib/core/base/rule.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/core/base/rule.js b/lib/core/base/rule.js
index 1dbb732443..57ebb87c82 100644
--- a/lib/core/base/rule.js
+++ b/lib/core/base/rule.js
@@ -151,10 +151,7 @@ Rule.prototype.run = function (context, options, resolve, reject) {
 
 				checkQueue.then(function (results) {
 					if (results.length) {
-						var hasResults = false,
-							result = {
-								node: new axe.utils.DqElement(node)
-							};
+						var hasResults = false, result = {};
 						results.forEach(function (r) {
 							var res = r.results.filter(function (result) {
 								return result;
@@ -165,6 +162,7 @@ Rule.prototype.run = function (context, options, resolve, reject) {
 							}
 						});
 						if (hasResults) {
+							result.node = new axe.utils.DqElement(node);
 							ruleResult.nodes.push(result);
 						}
 					}

From 91795e28c4a25f1425991194a94bffd2cecf945c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Wed, 23 Nov 2016 11:00:57 -0800
Subject: [PATCH 24/40] docs(typescript): fix path and update usage (#254)

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2c95b4c85e..7abc4a492f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -100,9 +100,11 @@ grunt build
 
 ## Using aXe with TypeScript
 
-The TypeScript definition file for axe-core can be found in [typings/axe-core](./typings/axe-core).
+### aXe Development
 
-To develop with TypeScript you must first install it (globally recommended):
+The TypeScript definition file for axe-core is distributed with this module [axe.d.ts](./axe.d.ts). It currently supports TypeScript 2.0+.
+
+To maintain aXe support for TypeScript you must first install it (globally recommended):
 ```
 sudo npm -g install typescript
 ```
@@ -111,3 +113,19 @@ Once that's installed, you can run TypeScript definition tests (with the optiona
 ```
 tsc --noImplicitAny typings/axe-core/axe-core-tests.ts
 ```
+
+## Including aXe's type definition in tests
+
+Installing aXe to run accessibility tests in your TypeScript project should be as simple as importing the module:
+
+```javascript
+import * as axe from 'axe-core';
+
+describe('Module', () => {
+	it('should have no accessibility violations', () => {
+		axe.a11yCheck(compiledFixture, {}, (results) => {
+			expect(results.violations.length).toBe(0);
+		});
+	});
+});
+```
\ No newline at end of file

From 4d8a61d192cb913d29f7608a4120f1b2067e0bf3 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Wed, 23 Nov 2016 14:43:32 -0800
Subject: [PATCH 25/40] docs: add commit and PR guidelines (#259)

Closes https://dequesrc.atlassian.net/browse/WWD-413
---
 CONTRIBUTING.md                   |  11 ++-
 doc/code-submission-guidelines.md | 152 ++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 doc/code-submission-guidelines.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7abc4a492f..f2910f80a7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,11 +6,18 @@ In order to contribute, you must accept the [contributor licence agreement](http
 
 ## Contribution Guidelines
 
+Submitting code to the project? Please review and follow our
+[Git commit and pull request guidelines](doc/code-submission-guidelines.md).
+
 ### Code Quality
 
-Although we do not have official coding guidelines, we can and will request you to make changes if we think that your code is sloppy. You can take clues from the existing code base to see what we consider to be reasonable code quality. Please be prepared to make changes that we ask of you even if you might not agree with the request(s).
+Although we do not have official code style guidelines, we can and will request you to make changes
+if we think that your code is sloppy. You can take clues from the existing code base to see what we
+consider to be reasonable code quality. Please be prepared to make changes that we ask of you even
+if you might not agree with the request(s).
 
-Pull requests that change the tabs of a file (spacing or changes from spaces to tabs and vice versa) will not be accepted. Please respect the coding style of the files you are changing and adhere to that.
+Pull requests that change the tabs of a file (spacing or changes from spaces to tabs and vice versa)
+will not be accepted. Please respect the coding style of the files you are changing and adhere to that.
 
 That having been said, we prefer:
 
diff --git a/doc/code-submission-guidelines.md b/doc/code-submission-guidelines.md
new file mode 100644
index 0000000000..d98dc961cb
--- /dev/null
+++ b/doc/code-submission-guidelines.md
@@ -0,0 +1,152 @@
+# Code Submission Guidelines
+
+We've enacted standards for commits and pull requests to effectively manage the project over
+time. We expect all code contributed to follow these standards. If your code doesn't follow them, we
+will kindly ask you to resubmit it in the correct format.
+
+- [Git Commits](#git-commits)
+- [Merging a pull request](#merging-a-pull-request)
+- [Squashing Commits](#squashing-everything-into-one-commit)
+
+## Git Commits
+
+We follow Angular's code contribution style with precise rules for formatting git commit messages.
+This leads to more readable messages that are easy to follow when looking through the project
+history. We will also use commit messages to generate the aXe Changelog document.
+
+A detailed explanation of Angular's guidelines and conventions can be found [on Google Docs](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#).
+
+### Commit Message Format
+
+Each commit message should consist of a header, a body and a footer. The header has a special format
+that includes a type, a scope and a subject. Here's a sample of the format:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+### Here's an example:
+
+```sh
+perf(color-contrast): improve speed of color contrast rules
+
+	Use async process to compare elements without UI lockup
+
+    Closes #1
+```
+
+> Commit messages should be 100 characters or less to make them easy to read on Github and
+various git tools.
+
+### How to structure your commits:
+
+#### Type
+
+Must be one of the following:
+
+- **feat:** A new feature
+- **fix:** A bug fix
+- **docs:** Documentation only changes
+- **style:** Changes that do not affect the meaning of the code (white-space, formatting, missing
+semi-colons, etc)
+- **refactor:** A code change that neither fixes a bug nor adds a feature
+- **perf:** A code change that improves performance
+- **test:** Adding missing tests
+- **chore:** Changes to the build process or auxiliary tools and libraries such as documentation
+generation
+
+#### Scope
+
+The scope specifies the place of the commit change in the codebase along with the type. It could
+reference a rule name, a commons file, or anything really. E.g. `perf(color-contrast)` or
+`test(p-as-heading)`.
+
+If the scope is too broad to summarize, use the type only and leave off the parentheses. E.g.
+`type: some subject`
+
+
+#### Subject
+
+The subject contains succinct description of the change:
+
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- don't capitalize first letter
+- no dot (.) at the end
+
+#### Body
+
+Use the imperative, present tense: "change" not "changed" nor "changes", just like the subject.
+Include the motivation for the change and contrast it with how the code worked before.
+
+#### Footer
+
+Reference any issue that this commit closes with its fully qualified URL to support both
+Bitbucket and Github.
+
+If needed, the footer should contain any information about Breaking Changes. Deprecation notices or
+breaking changes in the Changelog should inform users if they'll need to modify their code after
+this commit.
+
+
+## Merging a pull request
+
+To apply a pull request, make sure your local develop branch is up to date. Then, create a new branch
+for that pull request:
+```sh
+git checkout -b some-user-feature
+```
+
+Run the following commands to apply all commits from that pull request on top of your branch's local history:
+
+### Bitbucket
+
+```
+curl -L https://bitbucket.org/api/2.0/repositories/dmusser/axe-core/pullrequests/85/patch | git am -3
+```
+
+### Github
+
+```
+curl -L https://github.com/dequelabs/axe-core/pull/205.patch | git am -3
+```
+
+> In the Github UI, you can use the new [Squash and Merge](https://github.com/blog/2141-squash-your-commits) feature as an alternative.
+
+If the merge succeeds, use `git diff origin/develop` to review all the changes that will happen
+post-merge.
+
+## Squashing everything into one commit
+
+Before merging a pull request into develop, make sure there is only one commit representing the
+changes in the pull request, so the git log stays lean.
+
+You can use git's interactive rebase to manipulate, merge, and rename commits in your local
+history.
+
+To interactively rebase all of your commits on top of the latest in develop, run:
+
+```sh
+git rebase --interactive origin/develop
+```
+
+This brings up an interactive dialog in your text editor. Follow the instructions to squash all
+of your commits into the top one. Rename the top one.
+
+Once this is done, run `git log` and you will see only one commit after develop, representing
+everything from the pull request.
+
+Finally, pull from develop with `rebase` to put all of our local commits on top of the latest
+remote.
+
+```sh
+git pull --rebase origin develop
+```
+
+You can then push the latest code to develop (note that force push isn't needed if these steps are followed):
+```
+git push origin develop
+```
\ No newline at end of file

From cf54f747d66386d5a5651ac03f380a3eb7154c49 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Thu, 24 Nov 2016 16:16:21 -0500
Subject: [PATCH 26/40] Add grunt task for checking dependencies for
 vulnerabilities using Snyk

---
 Gruntfile.js | 5 +++--
 package.json | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 3e1134c49c..9ad76848a0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,6 +12,7 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-mocha');
+	grunt.loadNpmTasks('grunt-snyk');
 	grunt.loadTasks('build/tasks');
 
 	grunt.initConfig({
@@ -234,11 +235,11 @@ module.exports = function (grunt) {
 
 	grunt.registerTask('default', ['build']);
 
-	grunt.registerTask('build', ['clean', 'jshint', 'validate', 'concat:commons', 'configure',
+	grunt.registerTask('build', ['clean', 'jshint', 'validate', 'snyk', 'concat:commons', 'configure',
 		 'babel', 'concat:engine', 'uglify']);
 
 	grunt.registerTask('test', ['build', 'testconfig', 'fixture', 'connect',
-		'mocha', 'jshint']);
+		'mocha']);
 
 	grunt.registerTask('test-browser', ['build',  'testconfig', 'fixture', 'connect',
 		'test-webdriver']);
diff --git a/package.json b/package.json
index ea3318887f..5f18ca60d4 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "grunt-contrib-uglify": "~1.0.1",
     "grunt-contrib-watch": "~1.0.0",
     "grunt-mocha": "~0.4.13",
+    "grunt-snyk": "^0.1.0",
     "html-entities": "^1.2.0",
     "jquery": "^3.0.0",
     "less": "~2.6.1",

From 3e204b9f6c6776a89a4901392f4ab310b5915742 Mon Sep 17 00:00:00 2001
From: Christoffer Klang <christoffer@dropbox.com>
Date: Mon, 28 Nov 2016 14:51:37 +0100
Subject: [PATCH 27/40] Add tests for calls to DqElement

---
 test/core/base/rule.js | 88 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index 15b6bbc8f3..974ea49337 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -313,7 +313,95 @@ describe('Rule', function() {
 				}, {}, function(r) {
 					assert.lengthOf(r.nodes, 0);
 				}, isNotCalled);
+			});
+
+			describe('DqElement', function() {
+				var origDqElement;
+				var isDqElementCalled;
+
+				beforeEach(function() {
+					isDqElementCalled = false;
+					origDqElement = axe.utils.DqElement;
+					axe.utils.DqElement = function() {
+						isDqElementCalled = true;
+					};
+					fixture.innerHTML = '<blink>Hi</blink>';
+				});
+
+				afterEach(function() {
+					axe.utils.DqElement = origDqElement;
+				});
+
+				it('is created for matching nodes', function(done) {
+					var rule = new Rule({
+						all: ['cats']
+					}, {
+						checks: {
+							cats: new Check({
+								id: 'cats',
+								enabled: true,
+								evaluate: function() {
+									return true;
+								},
+								matches: function() {
+									return true;
+								}
+							})
+						}
+					});
+					rule.run({
+						include: [fixture]
+					}, {}, function() {
+						assert.isTrue(isDqElementCalled);
+						done();
+					}, isNotCalled);
+				});
+
+				it('is not created for disabled checks', function(done) {
+					var rule = new Rule({
+						all: ['cats']
+					}, {
+						checks: {
+							cats: new Check({
+								id: 'cats',
+								enabled: false,
+								evaluate: function() {},
+								matches: function() {
+									return true;
+								}
+							})
+						}
+					});
+					rule.run({
+						include: [fixture]
+					}, {}, function() {
+						assert.isFalse(isDqElementCalled);
+						done();
+					}, isNotCalled);
+				});
 
+				it('is not created for un-matching nodes', function(done) {
+					var rule = new Rule({
+						all: ['cats']
+					}, {
+						checks: {
+							cats: new Check({
+								id: 'cats',
+								enabled: true,
+								evaluate: function() {},
+								matches: function() {
+									return false;
+								}
+							})
+						}
+					});
+					rule.run({
+						include: [fixture]
+					}, {}, function() {
+						assert.isFalse(isDqElementCalled);
+						done();
+					}, isNotCalled);
+				});
 			});
 
 			it('should pass thrown errors to the reject param', function (done) {

From 7ed4d95e31f7e56347a4d59da14dbfbe596d63ba Mon Sep 17 00:00:00 2001
From: Christoffer Klang <christoffer@dropbox.com>
Date: Mon, 28 Nov 2016 19:06:52 +0100
Subject: [PATCH 28/40] Fix linter error

---
 test/core/base/rule.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index 974ea49337..d5aa899c26 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -1,4 +1,4 @@
-/*global Rule */
+/*global Rule, Check */
 describe('Rule', function() {
 	'use strict';
 

From b45ae65dd2a8a9d7413a622b8f0f879451dac9e7 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <holla@marcysutton.com>
Date: Tue, 13 Dec 2016 13:18:14 -0800
Subject: [PATCH 29/40] Sync with Attest/2.1.6 (#265)

* chore: merge Bitbucket:master into Github

* test: run test-fast on travis-ci

* chore: add timeouts to avoid race condition

* feat: add axe.run to TypeScript definition

* chore: bump version to 2.1.7
---
 .travis.yml                                   |   2 +-
 Gruntfile.js                                  |  87 ++++--
 README.md                                     |   3 +-
 axe.d.ts                                      |  78 ++---
 bower.json                                    |   2 +-
 build/tasks/test-webdriver.js                 | 160 ++++++++++
 build/tasks/test.js                           |  53 ----
 build/test/config.js                          |  19 +-
 doc/API.md                                    |  90 ++++--
 doc/developer-guide.md                        |   5 +-
 doc/examples/jasmine/README.md                |   6 +-
 doc/examples/jasmine/spec/a11y.js             |   6 +-
 doc/examples/mocha/README.md                  |   6 +-
 doc/examples/mocha/test/a11y.js               |   6 +-
 doc/examples/phantomjs/axe-phantom.js         |   9 +-
 doc/examples/qunit/README.md                  |   6 +-
 doc/examples/qunit/test/a11y.js               |   6 +-
 doc/examples/selenium/README.md               |   2 +-
 doc/plugins.md                                |  37 ++-
 doc/rule-descriptions.md                      |   3 +-
 lib/.jshintrc                                 |   2 +-
 lib/checks/aria/allowed-attr.json             |   1 -
 lib/checks/aria/valid-attr-value.json         |   1 -
 lib/checks/aria/valid-attr.json               |   1 -
 lib/checks/color/color-contrast.js            |   2 +-
 lib/checks/color/color-contrast.json          |   1 -
 lib/checks/color/link-in-text-block.js        |  11 +-
 lib/checks/label/explicit.js                  |   9 +-
 lib/checks/label/explicit.json                |   1 -
 lib/checks/navigation/header-present.json     |   1 -
 .../navigation/internal-link-present.json     |   1 -
 lib/checks/navigation/landmark.js             |   2 +-
 lib/checks/navigation/landmark.json           |   1 -
 lib/checks/navigation/skip-link.json          |   1 -
 .../navigation/unique-frame-title-after.js    |   7 +-
 lib/checks/navigation/unique-frame-title.js   |   3 +-
 lib/checks/shared/aria-labelledby.js          |  14 +-
 lib/checks/shared/button-has-visible-text.js  |  13 +
 .../shared/button-has-visible-text.json       |   3 +-
 lib/checks/shared/has-visible-text.js         |   2 +-
 lib/checks/shared/non-empty-if-present.js     |  12 +-
 lib/checks/shared/non-empty-if-present.json   |   1 -
 lib/checks/shared/non-empty-value.js          |   2 +-
 lib/checks/shared/non-empty-value.json        |   1 -
 lib/checks/tables/caption-faked.js            |   2 +-
 lib/checks/tables/same-caption-summary.json   |   1 -
 lib/checks/tables/td-has-header.js            |  36 +--
 lib/checks/tables/th-has-data-cells.js        |  86 ++----
 lib/commons/color/element-is-distinct.js      |   8 +-
 lib/commons/color/get-background-color.js     | 267 ++++++++---------
 lib/commons/dom/elements-below-floating.js    |  37 +++
 lib/commons/dom/elements-from-point.js        | 121 --------
 lib/commons/table/get-all-cells.js            |  11 +
 lib/commons/table/get-cell-position.js        |  15 +-
 lib/commons/table/get-headers.js              |  30 +-
 lib/commons/table/get-scope.js                |  52 ++++
 lib/commons/table/is-column-header.js         |  27 +-
 lib/commons/table/is-row-header.js            |  30 +-
 lib/commons/table/{to-array.js => to-grid.js} |   7 +-
 lib/commons/table/traverse.js                 |  59 ++++
 lib/core/base/audit.js                        | 157 ++++++++--
 lib/core/base/check.js                        | 139 +++------
 lib/core/base/context.js                      |  31 +-
 lib/core/base/rule-result.js                  |   2 +-
 lib/core/constants.js                         |  67 ++++-
 lib/core/public/a11y-check.js                 |  33 +++
 lib/core/public/configure.js                  |  11 +-
 lib/core/public/load.js                       |   2 +-
 lib/core/public/reporter.js                   |   8 +-
 lib/core/public/run-rules.js                  |  32 +-
 lib/core/public/run.js                        | 137 +++++++++
 lib/core/reporters/helpers/failure-summary.js |  13 +-
 lib/core/reporters/helpers/format-check.js    |  13 -
 lib/core/reporters/helpers/format-checks.js   |   9 -
 lib/core/reporters/helpers/format-node.js     |   9 -
 .../reporters/helpers/format-rule-result.js   |  15 -
 .../reporters/helpers/process-aggregate.js    |  64 ++++
 .../reporters/helpers/split-results-checks.js |   5 -
 lib/core/reporters/helpers/split-results.js   |  42 ---
 lib/core/reporters/na.js                      |  25 +-
 lib/core/reporters/no-passes.js               |  15 +-
 lib/core/reporters/raw.js                     |   6 +-
 lib/core/reporters/v1.js                      |  29 +-
 lib/core/reporters/v2.js                      |  19 +-
 lib/core/utils/aggregate.js                   |  22 ++
 lib/core/utils/aggregateChecks.js             |  73 +++++
 lib/core/utils/aggregateResult.js             |  40 +++
 lib/core/utils/aggregateRule.js               |  53 ++++
 lib/core/utils/collect-results-from-frames.js |  65 +----
 lib/core/utils/dq-element.js                  |  14 +-
 lib/core/utils/extend-blacklist.js            |  19 --
 lib/core/utils/extend-meta-data.js            |  23 +-
 lib/core/utils/finalize-result.js             | 108 +------
 lib/core/utils/find-by.js                     |  10 +-
 lib/core/utils/get-xpath.js                   |  85 ++++++
 lib/core/utils/merge-results.js               |  18 +-
 lib/core/utils/pollyfills.js                  | 167 +++++++++++
 lib/core/utils/publish-metadata.js            |   3 +-
 lib/core/utils/respondable.js                 |  13 +
 lib/core/utils/rule-should-run.js             |  25 +-
 .../aria-allowed-attr-matches.js}             |   1 -
 lib/rules/aria-allowed-attr.json              |   1 +
 .../aria-has-attr-matches.js}                 |   0
 lib/rules/aria-valid-attr-value.json          |   1 +
 lib/rules/aria-valid-attr.json                |   1 +
 .../color => rules}/color-contrast-matches.js |   2 +
 lib/rules/color-contrast.json                 |   2 +-
 lib/rules/document-title.json                 |   1 +
 lib/rules/frame-title-has-text.js             |   2 +
 lib/rules/frame-title-unique.json             |  17 ++
 lib/rules/frame-title.json                    |  14 +-
 lib/rules/window-is-top.js                    |   2 +
 package.json                                  |   6 +-
 test/checks/.jshintrc                         |   2 +-
 test/checks/aria/allowed-attr.js              |  56 ----
 test/checks/aria/valid-attr-value.js          |  20 --
 test/checks/aria/valid-attr.js                |  18 --
 test/checks/color/color-contrast.js           | 180 ------------
 test/checks/color/link-in-text-block.js       |  23 +-
 test/checks/navigation/landmark.js            |   5 +
 test/checks/navigation/region.js              |   2 +-
 .../navigation/unique-frame-title-after.js    |  21 +-
 test/checks/navigation/unique-frame-title.js  |  14 +
 test/checks/shared/non-empty-if-present.js    |  26 +-
 test/checks/tables/td-has-header.js           |  32 ++
 test/commons/color/get-background-color.js    | 187 ++++++++----
 test/commons/dom/elements-from-point.js       |  98 -------
 test/commons/table/get-scope.js               | 206 +++++++++++++
 test/commons/table/is-column-header.js        |  95 +++---
 test/commons/table/is-row-header.js           |  92 +++---
 .../commons/table/{to-array.js => to-grid.js} |  38 ++-
 test/commons/table/traverse.js                | 131 +++++++++
 test/commons/text/accessible-text.js          |   4 +-
 test/core/base/audit.js                       | 255 ++++++++--------
 test/core/base/check.js                       | 112 -------
 test/core/base/context.js                     |  46 ++-
 test/core/base/rule.js                        |  35 +--
 test/core/constants.js                        |  37 ++-
 test/core/public/a11y-check.js                |  69 +++++
 test/core/public/configure.js                 |  72 ++++-
 test/core/public/reporter.js                  |  19 +-
 test/core/public/reset.js                     |  26 +-
 test/core/public/run-rules.js                 | 269 ++++++++++-------
 test/core/public/run.js                       | 273 ++++++++++++++++++
 .../core/reporters/helpers/failure-summary.js |   6 +-
 test/core/reporters/helpers/format-check.js   |  58 ----
 test/core/reporters/helpers/format-checks.js  |  29 --
 test/core/reporters/helpers/format-node.js    |  24 --
 .../reporters/helpers/format-rule-result.js   |  66 -----
 .../reporters/helpers/split-results-checks.js |  24 --
 test/core/reporters/na.js                     |  82 +++---
 test/core/reporters/no-passes.js              |  64 ++--
 test/core/reporters/raw.js                    |  11 +-
 test/core/reporters/v1.js                     |  60 ++--
 test/core/reporters/v2.js                     |  69 +++--
 test/core/utils/aggregate.js                  |  48 +++
 test/core/utils/aggregateChecks.js            | 161 +++++++++++
 test/core/utils/aggregateResult.js            | 184 ++++++++++++
 test/core/utils/aggregateRule.js              | 127 ++++++++
 .../core/utils/collect-results-from-frames.js |   2 +-
 test/core/utils/dq-element.js                 |  33 ++-
 test/core/utils/finalize-result.js            | 205 ++-----------
 test/core/utils/get-xpath.js                  |  97 +++++++
 .../utils/pollyfills.elements-from-point.js   | 150 ++++++++++
 test/core/utils/respondable.js                |  10 +
 test/core/utils/rule-should-run.js            |  83 ++++++
 test/integration/full/bypass/fail.js          |   4 +-
 test/integration/full/bypass/pass-tests.js    |   3 +-
 test/integration/full/context/context.html    |   4 +-
 test/integration/full/context/context.js      | 103 ++++---
 .../full/contrast/sticky-header.js            |   3 +-
 .../full/definition-list/dl-role.js           |   3 +-
 .../full/definition-list/dlitem-role.js       |   3 +-
 .../document-title/document-title-fail.html   |  23 ++
 .../document-title/document-title-fail.js     |  36 +++
 ...nt-title.html => document-title-pass.html} |   2 +-
 .../document-title/document-title-pass.js     |  39 +++
 .../full/document-title/document-title.js     |  39 ---
 .../full/html-has-lang/html-has-lang.js       |  12 +-
 .../full/html-lang-valid/html-lang-valid.js   |  12 +-
 ...de.html => a11ycheck-include-exclude.html} |   2 +-
 .../full/jquery/a11ycheck-include-exclude.js  |  29 ++
 .../full/jquery/a11ycheck-object-exclude.html |  36 ---
 .../full/jquery/a11ycheck-object-exclude.js   |  13 -
 .../full/jquery/a11ycheck-object-include.js   |  13 -
 .../full/jquery/a11ycheck-object.js           |   5 +-
 test/integration/full/list/li-role.js         |   3 +-
 test/integration/full/list/list-role.js       |   3 +-
 test/integration/full/region/region-fail.js   |   3 +-
 test/integration/full/region/region-pass.js   |   3 +-
 .../full/skip-link/skip-link-fail.js          |   3 +-
 .../full/skip-link/skip-link-pass.js          |   3 +-
 test/integration/full/umd/umd-define.html     |   2 +-
 .../full/umd/umd-module-exports.html          |   2 +-
 test/integration/full/umd/umd-window.html     |   2 +-
 .../rules/color-contrast/color-contrast.html  |  10 +-
 .../rules/color-contrast/color-contrast.json  |  12 +-
 .../frame-title-unique.html                   |   5 +
 .../frame-title-unique.json                   |  12 +
 .../frame-title-unique/frames/level1.html     |  12 +
 .../frame-title-unique/frames/level1a.html    |  11 +
 .../frame-title-unique/frames/level2-a.html   |  11 +
 .../frame-title-unique/frames/level2.html     |   9 +
 .../rules/frame-title/frame-title.html        |  11 +-
 .../rules/frame-title/frame-title.json        |  13 +-
 .../rules/frame-title/frames/level1.html      |   2 +-
 test/integration/rules/runner.js              |   9 +-
 test/mock/frames/recursive.html               |  26 --
 test/mock/frames/rule-error.html              |  34 +++
 test/playground.html                          |  10 +-
 .../rule-matches/aria-allowed-attr-matches.js |  75 +++++
 test/rule-matches/aria-has-attr-matches.js    |  36 +++
 test/rule-matches/color-contrast-matches.js   | 196 +++++++++++++
 typings/axe-core/axe-core-tests.ts            |  15 +
 214 files changed, 5216 insertions(+), 2896 deletions(-)
 create mode 100644 build/tasks/test-webdriver.js
 delete mode 100644 build/tasks/test.js
 create mode 100644 lib/checks/shared/button-has-visible-text.js
 create mode 100644 lib/commons/dom/elements-below-floating.js
 delete mode 100644 lib/commons/dom/elements-from-point.js
 create mode 100644 lib/commons/table/get-all-cells.js
 create mode 100644 lib/commons/table/get-scope.js
 rename lib/commons/table/{to-array.js => to-grid.js} (81%)
 create mode 100644 lib/commons/table/traverse.js
 create mode 100644 lib/core/public/a11y-check.js
 create mode 100644 lib/core/public/run.js
 delete mode 100644 lib/core/reporters/helpers/format-check.js
 delete mode 100644 lib/core/reporters/helpers/format-checks.js
 delete mode 100644 lib/core/reporters/helpers/format-node.js
 delete mode 100644 lib/core/reporters/helpers/format-rule-result.js
 create mode 100644 lib/core/reporters/helpers/process-aggregate.js
 delete mode 100644 lib/core/reporters/helpers/split-results-checks.js
 delete mode 100644 lib/core/reporters/helpers/split-results.js
 create mode 100644 lib/core/utils/aggregate.js
 create mode 100644 lib/core/utils/aggregateChecks.js
 create mode 100644 lib/core/utils/aggregateResult.js
 create mode 100644 lib/core/utils/aggregateRule.js
 delete mode 100644 lib/core/utils/extend-blacklist.js
 create mode 100644 lib/core/utils/get-xpath.js
 create mode 100644 lib/core/utils/pollyfills.js
 rename lib/{checks/aria/allowed-attr-matches.js => rules/aria-allowed-attr-matches.js} (99%)
 rename lib/{checks/aria/has-attr-matches.js => rules/aria-has-attr-matches.js} (100%)
 rename lib/{checks/color => rules}/color-contrast-matches.js (98%)
 create mode 100644 lib/rules/frame-title-has-text.js
 create mode 100644 lib/rules/frame-title-unique.json
 create mode 100644 lib/rules/window-is-top.js
 delete mode 100644 test/commons/dom/elements-from-point.js
 create mode 100644 test/commons/table/get-scope.js
 rename test/commons/table/{to-array.js => to-grid.js} (67%)
 create mode 100644 test/commons/table/traverse.js
 create mode 100644 test/core/public/a11y-check.js
 create mode 100644 test/core/public/run.js
 delete mode 100644 test/core/reporters/helpers/format-check.js
 delete mode 100644 test/core/reporters/helpers/format-checks.js
 delete mode 100644 test/core/reporters/helpers/format-node.js
 delete mode 100644 test/core/reporters/helpers/format-rule-result.js
 delete mode 100644 test/core/reporters/helpers/split-results-checks.js
 create mode 100644 test/core/utils/aggregate.js
 create mode 100644 test/core/utils/aggregateChecks.js
 create mode 100644 test/core/utils/aggregateResult.js
 create mode 100644 test/core/utils/aggregateRule.js
 create mode 100644 test/core/utils/get-xpath.js
 create mode 100644 test/core/utils/pollyfills.elements-from-point.js
 create mode 100644 test/integration/full/document-title/document-title-fail.html
 create mode 100644 test/integration/full/document-title/document-title-fail.js
 rename test/integration/full/document-title/{document-title.html => document-title-pass.html} (92%)
 create mode 100644 test/integration/full/document-title/document-title-pass.js
 delete mode 100644 test/integration/full/document-title/document-title.js
 rename test/integration/full/jquery/{a11ycheck-object-include.html => a11ycheck-include-exclude.html} (93%)
 create mode 100644 test/integration/full/jquery/a11ycheck-include-exclude.js
 delete mode 100644 test/integration/full/jquery/a11ycheck-object-exclude.html
 delete mode 100644 test/integration/full/jquery/a11ycheck-object-exclude.js
 delete mode 100644 test/integration/full/jquery/a11ycheck-object-include.js
 create mode 100644 test/integration/rules/frame-title-unique/frame-title-unique.html
 create mode 100644 test/integration/rules/frame-title-unique/frame-title-unique.json
 create mode 100644 test/integration/rules/frame-title-unique/frames/level1.html
 create mode 100644 test/integration/rules/frame-title-unique/frames/level1a.html
 create mode 100644 test/integration/rules/frame-title-unique/frames/level2-a.html
 create mode 100644 test/integration/rules/frame-title-unique/frames/level2.html
 delete mode 100644 test/mock/frames/recursive.html
 create mode 100644 test/mock/frames/rule-error.html
 create mode 100644 test/rule-matches/aria-allowed-attr-matches.js
 create mode 100644 test/rule-matches/aria-has-attr-matches.js
 create mode 100644 test/rule-matches/color-contrast-matches.js

diff --git a/.travis.yml b/.travis.yml
index 7e13f9874c..b7e0e99075 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
-  - npm test
+  - npm run test-fast
 env:
   global:
     - secure: qjMwfcWDzEhGWxVhmGi5s0MlsU4N/SI96mx6Gj36/GySxgIUU9EFXeN4SZS2OvRmy2/+l0XSt5ln9PWp4Suh2LM8/GaR5I6FALs/9rOLU9py0/G9V1ImqNN9Z6Nk6PvS71SAwP7xOtR+xsywnUEdHZ7dCA3fYEIsOkyq4KRQ9M7JHWogP+h+WsHPcznjPeNxVBCfYCXW0KhrLDzL4ZA+b2UY/IMZDXITdZ99TZQA6XSKTfJg3xs/jqXEo91igHNKN6VxappBqPbDiFxf7az1RExq3oHAawCDTaKE7xxip+6UIxAeo63tiM0vgp92HVrVsIQETSQFBP4aqhl/pfxQ7d9lto7Mz5AlxKvJ3CIwDD/hspPzG5SNrj/FgQLgK7LrUOomMOjf8giRUg8XXLe7Rb1jmbePP3Z9DIEg4Z+ar3dpC2dNiWYFwBM14wY39GuU6tJpzImGRRUGCMPiO55TVTdRZacVeIq1XWRecIH0CabZThJCwOxyiGIT5ETiT5CVs0CgnbVe99l1qyi8wrMnbw4m4UAlMQ/5kytqtsL957RwxvcctCtX+LlshAgC3m1Aq/aF8V/wIYDcRlwOY2HbGiFQJewV7Aeln3t/S8VFjP9hHn8ZTsH9ez3VB57Q53YgrxFCr6CXEK4X3dkmRpx9in3oDI51TxW32tInwGTukSg=
diff --git a/Gruntfile.js b/Gruntfile.js
index 9ad76848a0..6403bf53cd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,6 @@
 //jshint maxcomplexity: 12, maxstatements: false, camelcase: false
 var testConfig = require('./build/test/config');
+
 module.exports = function (grunt) {
 	'use strict';
 
@@ -14,26 +15,45 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-mocha');
 	grunt.loadNpmTasks('grunt-snyk');
 	grunt.loadTasks('build/tasks');
+	grunt.loadNpmTasks('grunt-parallel');
 
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
+		parallel: {
+			'browser-test': {
+				options: {
+					grunt: true
+				},
+				tasks: [
+					'test-webdriver:firefox',
+					'test-webdriver:chrome',
+					// Edge Webdriver isn't all too stable, manual testing required
+					// 'test-webdriver:edge',
+					'test-webdriver:safari',
+					'test-webdriver:ie'
+				]
+			}
+		},
 		clean: ['dist', 'tmp'],
 		babel: {
+			options: {
+				compact: 'false'
+			},
 			core: {
-                files: [{
-                    expand: true,
-                    cwd: 'lib/core',
-                    src: ['**/*.js'],
-                    dest: 'tmp/core'
-                }]
+				files: [{
+					expand: true,
+					cwd: 'lib/core',
+					src: ['**/*.js'],
+					dest: 'tmp/core'
+				}]
 			},
 			misc: {
 				files: [{
-                    expand: true,
-                    cwd: 'tmp',
-                    src: ['*.js'],
-                    dest: 'tmp'
-                }]
+					expand: true,
+					cwd: 'tmp',
+					src: ['*.js'],
+					dest: 'tmp'
+				}]
 			}
 		},
 		'update-help': {
@@ -112,8 +132,8 @@ module.exports = function (grunt) {
 		uglify: {
 			beautify: {
 				files: [{
-					src: ['<%= concat.engine.dest %>'],
-					dest: '<%= concat.engine.dest %>'
+					src: ['./axe.js'],
+					dest: './axe.js'
 				}],
 				options: {
 					mangle: false,
@@ -195,6 +215,21 @@ module.exports = function (grunt) {
 					}
 				}
 			},
+			ruleMatches: {
+				src: [
+					'<%= concat.engine.dest %>',
+					'build/test/engine.js',
+					'<%= configure.rules.dest.auto %>'
+				],
+				dest: 'test/rule-matches/index.html',
+				options: {
+					fixture: 'test/runner.tmpl',
+					testCwd: 'test/rule-matches',
+					data: {
+						title: 'aXe Rule Matches Tests'
+					}
+				}
+			},
 			integration: {
 				src: ['<%= concat.engine.dest %>'],
 				dest: 'test/integration/rules/index.html',
@@ -208,10 +243,23 @@ module.exports = function (grunt) {
 				}
 			}
 		},
-		mocha: testConfig(grunt),
-		'test-webdriver': testConfig(grunt, {
-			browser: grunt.option('browser') || 'firefox'
+		mocha: testConfig(grunt, {
+			reporter: grunt.option('reporter') || 'Spec'
 		}),
+		'test-webdriver': (function () {
+			var tests = testConfig(grunt);
+			var options = Object.assign({}, tests.unit.options);
+			options.urls = options.urls.concat(tests.integration.options.urls);
+			var driverTests = {};
+
+			['firefox', 'chrome', 'ie', 'safari', 'edge']
+			.forEach(function (browser) {
+				driverTests[browser] = {
+					options: Object.assign({ browser: browser }, options)
+				};
+			});
+			return driverTests;
+		}()),
 		connect: {
 			test: {
 				options: {
@@ -239,11 +287,10 @@ module.exports = function (grunt) {
 		 'babel', 'concat:engine', 'uglify']);
 
 	grunt.registerTask('test', ['build', 'testconfig', 'fixture', 'connect',
-		'mocha']);
-
-	grunt.registerTask('test-browser', ['build',  'testconfig', 'fixture', 'connect',
-		'test-webdriver']);
+		'mocha', 'parallel', 'jshint']);
 
+	grunt.registerTask('test-fast', ['build', 'testconfig', 'fixture', 'connect',
+		'mocha', 'jshint']);
 
 	grunt.registerTask('dev', ['build', 'testconfig', 'fixture', 'connect', 'watch']);
 };
diff --git a/README.md b/README.md
index bc391c2060..74a6bf8fe6 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,8 @@ Now include the javascript file in each of your iframes in your fixtures or test
 Now insert calls at each point in your tests where a new piece of UI becomes visible or exposed:
 
 ```js
-axe.a11yCheck(document, function (results) {
+axe.run(function (err, results) {
+	if (err) throw err;
     ok(results.violations.length === 0, 'Should be no accessibility issues');
     // complete the async call
     ...
diff --git a/axe.d.ts b/axe.d.ts
index 7c5ea81be5..c8786b9938 100644
--- a/axe.d.ts
+++ b/axe.d.ts
@@ -1,24 +1,24 @@
-// Type definitions for axe-core 2.0.8
+// Type definitions for axe-core 2.1.7
 // Project: https://github.com/dequelabs/axe-core
 // Definitions by: Marcy Sutton <https://github.com/marcysutton>
 
 declare module axe {
 
-	export type ImpactValue = "minor" | "moderate" | "serious" | "critical";
+	type ImpactValue = "minor" | "moderate" | "serious" | "critical";
 
-	export type TagValue = "wcag2a" | "wcag2aa" | "section508" | "best-practice";
+	type TagValue = "wcag2a" | "wcag2aa" | "section508" | "best-practice";
 
-	export type ReporterVersion = "v1" | "v2";
+	type ReporterVersion = "v1" | "v2";
 
-	export type RunOnlyType = "rule" | "rules" | "tag" | "tags";
+	type RunOnlyType = "rule" | "rules" | "tag" | "tags";
 
-	export interface ElementContext {
+	interface ElementContext {
 		node?: Object,
 		selector?: string,
 		include?: any[],
 		exclude?: any[]
 	}
-	export interface RunOnly {
+	interface RunOnly {
 		type: RunOnlyType,
 		value?: {
 			include?: string[],
@@ -26,13 +26,15 @@ declare module axe {
 		}
 		values?: TagValue[]
 	}
-	export interface AxeResults {
+	interface AxeResults {
 		url: string,
 		timestamp: string,
-		passes: Pass[],
-		violations: Violation[]
+		passes: Result[],
+		violations: Result[],
+		incomplete: Result[],
+		inapplicable: Result[]
 	}
-	export interface Pass {
+	interface Result {
 		description: string,
 		help: string,
 		helpUrl: string,
@@ -41,35 +43,27 @@ declare module axe {
 		tags: TagValue[],
 		nodes: NodeResult[]
 	}
-	export interface Violation {
-		description: string,
-		help: string,
-		helpUrl: string,
-		id: string,
-		impact: ImpactValue,
-		tags: TagValue[],
-		nodes: NodeResult[]
-	}
-	export interface NodeResult {
+	interface NodeResult {
 		html: string,
 		impact: ImpactValue,
 		target: string[],
 		any: CheckResult[],
 		all: CheckResult[],
-		none: CheckResult[]
+		none: CheckResult[],
+		failureSummary?: string
 	}
-	export interface CheckResult {
+	interface CheckResult {
 		id: string,
 		impact: string,
 		message: string,
 		data: any,
 		relatedNodes?: RelatedNode[]
 	}
-	export interface RelatedNode {
+	interface RelatedNode {
 		target: string[],
 		html: string
 	}
-	export interface Spec {
+	interface Spec {
 		branding?: {
 			brand: string,
 			application: string
@@ -78,7 +72,7 @@ declare module axe {
 		checks?: Check[],
 		rules?: Rule[]
 	}
-	export interface Check {
+	interface Check {
 		id: string,
 		evaluate: Function,
 		after?: Function,
@@ -86,7 +80,7 @@ declare module axe {
 		matches?: string,
 		enabled?: boolean
 	}
-	export interface Rule {
+	interface Rule {
 		id: string,
 		selector?: string,
 		excludeHidden?: boolean,
@@ -98,7 +92,7 @@ declare module axe {
 		tags?: string[],
 		matches?: string
 	}
-	export interface AxePlugin {
+	interface AxePlugin {
 		id: string,
 		run(...args:any[]): any,
 		commands: {
@@ -108,17 +102,27 @@ declare module axe {
 		cleanup?(callback:Function): void
 	}
 
-	export let plugins: any
+	let plugins: any
 
 	/**
 	 * Source string to use as an injected script in Selenium
 	 */
-	export let source: string
+	let source: string
 
 	/**
 	 * Object for aXe Results
 	 */
-	export var AxeResults: AxeResults
+	var AxeResults: AxeResults
+
+	/**
+	 * Runs a number of rules against the provided HTML page and returns the resulting issue list
+	 *
+	 * @param  {Object}   context  Optional The `Context` specification object @see Context
+	 * @param  {Array}    options  Optional Options passed into rules or checks, temporarily modifying them.
+	 * @param  {Function} callback Optional The function to invoke when analysis is complete.
+	 * @returns {any}  	  results  If the callback was not defined, aXe will return a Promise instead.
+	 */
+	function run(context?: ElementContext, options?: {runOnly?: RunOnly, rules?: Object}, callback?: (error: Error, results:AxeResults) => void): any
 
 	/**
 	 * Starts analysis on the current document and its subframes
@@ -128,37 +132,37 @@ declare module axe {
 	 * @param  {Function} callback The function to invoke when analysis is complete.
 	 * @returns {Object}  results  The aXe results object
 	 */
-	export function a11yCheck(context: ElementContext, options: {runOnly?: RunOnly, rules?: Object}, callback: (results:AxeResults) => void): AxeResults
+	function a11yCheck(context: ElementContext, options: {runOnly?: RunOnly, rules?: Object}, callback: (results:AxeResults) => void): AxeResults
 
 	/**
 	 * Method for configuring the data format used by aXe. Helpful for adding new
 	 * rules, which must be registered with the library to execute.
 	 * @param  {Spec}       Spec Object with valid `branding`, `reporter`, `checks` and `rules` data
 	 */
-	export function configure(spec: Spec): void
+	function configure(spec: Spec): void
 
 	/**
 	 * Searches and returns rules that contain a tag in the list of tags.
 	 * @param  {Array}  tags  Optional array of tags
 	 * @return {Array}  Array of rules
 	 */
-	export function getRules(tags?: string[]): Object[]
+	function getRules(tags?: string[]): Object[]
 
 	/**
 	 * Restores the default axe configuration
 	 */
-	export function reset(): void
+	function reset(): void
 
 	/**
 	 * Function to register a plugin configuration in document and its subframes
 	 * @param  {Object}    plugin    A plugin configuration object
 	 */
-	export function registerPlugin(plugin: AxePlugin): void
+	function registerPlugin(plugin: AxePlugin): void
 
 	/**
 	 * Function to clean up plugin configuration in document and its subframes
 	 */
-	export function cleanup(): void
+	function cleanup(): void
 
 }
 
diff --git a/bower.json b/bower.json
index f746761aa2..effbd2b9c5 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "1.1.1",
+  "version": "2.0.8",
   "authors": [
     "David Sturley <david.sturley@deque.com>"
   ],
diff --git a/build/tasks/test-webdriver.js b/build/tasks/test-webdriver.js
new file mode 100644
index 0000000000..ca1f1d6421
--- /dev/null
+++ b/build/tasks/test-webdriver.js
@@ -0,0 +1,160 @@
+/*global window */
+/*jshint node: true */
+'use strict';
+
+var Promise = require('promise');
+var WebDriver = require('selenium-webdriver');
+
+
+module.exports = function (grunt) {
+
+	/**
+	 * Keep injecting scripts until window.mochaResults is set
+	 */
+	function collectTestResults(driver) {
+		// inject a script that waits half a second
+		return driver.executeAsyncScript(function () {
+			var callback = arguments[arguments.length - 1];
+			setTimeout(function () {
+				// return the mocha results (or undefined if not finished)
+				callback(window.mochaResults);
+			}, 500);
+
+		}).then(function (result) {
+			// If there are no results, listen a little longer
+			if (!result) {
+				return collectTestResults(driver);
+
+			// if there are, return them
+			} else {
+				return Promise.resolve(result);
+			}
+		});
+	}
+
+	/**
+	 * Test each URL
+	 */
+	function runTestUrls(driver, urls) {
+		var url = urls.shift();
+		var errors = [];
+
+		// Give each page enough time
+		driver.manage().timeouts().setScriptTimeout(600);
+
+		return driver.get(url)
+		// Get results
+		.then(function () {
+			return collectTestResults(driver);
+
+		// And process them
+		}).then(function (result) {
+			grunt.log.writeln(url);
+
+			// Remember the errors
+			(result.reports || []).forEach(function (err) {
+				grunt.log.error(err.message);
+				err.url = url;
+				errors.push(err);
+			});
+
+			// Log the result of the page tests
+			grunt.log[ (result.failures ? 'error' : 'ok') ](
+				'passes: ' + result.passes + ', ' +
+				'failures: ' + result.failures + ', ' +
+				'duration: ' + (result.duration / 1000) +'s'
+			);
+			grunt.log.writeln();
+
+		}).then(function () {
+			// Start the next job, if any
+			if (urls.length > 0) {
+				return runTestUrls(driver, urls);
+			} else {
+				return Promise.resolve(errors);
+			}
+		});
+	}
+
+	/*
+	* Build web driver depends whether REMOTE_SELENIUM_URL is set
+	*/
+	function buildWebDriver(browser) {
+		var	webdriver;
+		if (process.env.REMOTE_SELENIUM_URL) {
+		  webdriver = new WebDriver.Builder()
+			.forBrowser(browser)
+			.usingServer(process.env.REMOTE_SELENIUM_URL)
+			.build();
+		} else {
+			webdriver = new WebDriver.Builder()
+			.forBrowser(browser)
+			.build();
+		}
+
+		return webdriver;
+	}
+
+	/**
+	 * Run all tests in a browser using webdriver
+	 */
+	grunt.registerMultiTask('test-webdriver', function () {
+		var driver;
+		var done = this.async();
+		var options = this.options({
+			browser: 'firefox'
+		});
+		// yes, really, and this isn't documented anywhere either.
+		options.browser = (options.browser === 'edge') ? 'MicrosoftEdge' : options.browser;
+
+
+		if ((process.platform === 'win32' && options.browser === 'safari') ||
+			  (process.platform === 'darwin' && ['ie', 'MicrosoftEdge'].indexOf(options.browser) !== -1) ||
+			 ((process.platform === 'linux' || process.env.REMOTE_SELENIUM_URL) &&
+			 ['ie', 'MicrosoftEdge', 'safari'].indexOf(options.browser) !== -1)
+		) {
+			grunt.log.writeln();
+			grunt.log.writeln('Skipped ' + options.browser + ' as it is not supported on this platform');
+			return done();
+		}
+
+		// try to load the browser
+		try {
+			driver = buildWebDriver(options.browser);
+
+		// If load fails, warn user and move to the next task
+		} catch (err) {
+			grunt.log.writeln();
+			grunt.log.error(err.message);
+			grunt.log.writeln('Aborted testing using ' + options.browser);
+			return done();
+		}
+
+		// Test all pages
+		runTestUrls(driver, options.urls)
+		.then(function (testErrors) {
+			// log each error and abort
+			testErrors.forEach(function(err) {
+				grunt.log.writeln();
+				grunt.log.error('URL: ' + err.url);
+				grunt.log.error('Describe: ' + err.titles.join(' > '));
+				grunt.log.error('it ' + err.name);
+				grunt.log.error(err.stack);
+				grunt.log.writeln();
+			});
+
+			// Return the success to Grunt
+			done(testErrors.length === 0);
+
+		// catch any potential problems
+		}).catch(function (err) {
+			grunt.log.error(err);
+			done(false);
+
+		// Lastly, always close the browser
+		}).then(function () {
+			return driver.quit();
+		});
+
+	});
+};
diff --git a/build/tasks/test.js b/build/tasks/test.js
deleted file mode 100644
index 92f8f7e4df..0000000000
--- a/build/tasks/test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*jshint node: true */
-'use strict';
-var Promise = require('promise');
-var WebDriver = require('selenium-webdriver');
-module.exports = function (grunt) {
-	grunt.registerMultiTask('test-webdriver', function () {
-		var options = this.options({
-			browser: 'firefox'
-		});
-		var done = this.async();
-		var driver = new WebDriver.Builder()
-			.forBrowser(options.browser)
-			.build();
-
-		driver.manage().timeouts().setScriptTimeout(5000);
-
-		Promise.all(options.urls.map(function (url) {
-			return new Promise(function(resolve) {
-				driver
-					.get(url)
-					.then(function () {
-						driver.executeAsyncScript(function () {
-							/*global window */
-							var callback = arguments[arguments.length - 1];
-							setTimeout(function isDone() {
-								if (!window.mochaResults) {
-									return setTimeout(isDone, 250);
-								}
-								window.mochaResults.url = window.location.href;
-								callback(window.mochaResults);
-							}, 250);
-						})
-						.then(function (results) {
-							resolve(results);
-						});
-
-					});
-			});
-		})).then(function (results) {
-			driver.quit().then(function () {
-				results.forEach(function (result) {
-					grunt.log.writeln(result.url);
-					if (result.failures) {
-						grunt.log.error(result.failures + ' failing tests');
-					} else {
-						grunt.log.ok(result.passes + ' passing tests');
-					}
-				});
-				done(results);
-			});
-		});
-	});
-};
diff --git a/build/test/config.js b/build/test/config.js
index a51ca267c8..94fb26f3c9 100644
--- a/build/test/config.js
+++ b/build/test/config.js
@@ -1,8 +1,13 @@
 exports = module.exports = function (grunt, options) {
+	var host = 'localhost';
+
+	if (process.env.REMOTE_TESTSERVER_HOST) {
+		host = process.env.REMOTE_TESTSERVER_HOST;
+	}
 
 	function mapToUrl(files, port) {
 		return grunt.file.expand(files).map(function (file) {
-			return 'http://localhost:' + port + '/' + file;
+			return 'http://' + host + ':' + port + '/' + file;
 		});
 	}
 
@@ -10,14 +15,15 @@ exports = module.exports = function (grunt, options) {
 		options: options,
 		unit: {
 			options: {
+				log: true,
 				urls: [
-					'http://localhost:<%= connect.test.options.port %>/test/core/',
-					'http://localhost:<%= connect.test.options.port %>/test/checks/',
-					'http://localhost:<%= connect.test.options.port %>/test/commons/',
-					'http://localhost:<%= connect.test.options.port %>/test/integration/rules/'
+					'http://' + host + ':<%= connect.test.options.port %>/test/core/',
+					'http://' + host + ':<%= connect.test.options.port %>/test/checks/',
+					'http://' + host + ':<%= connect.test.options.port %>/test/rule-matches/',
+					'http://' + host + ':<%= connect.test.options.port %>/test/commons/',
+					'http://' + host + ':<%= connect.test.options.port %>/test/integration/rules/'
 				],
 				run: true,
-				reporter: 'Spec',
 				mocha: {
 					grep: grunt.option('grep')
 				}
@@ -25,6 +31,7 @@ exports = module.exports = function (grunt, options) {
 		},
 		integration: {
 			options: {
+				log: true,
 				urls: mapToUrl(['test/integration/full/**/*.html', '!test/integration/full/**/frames/**/*.html'],
 					'<%= connect.test.options.port %>'),
 				run: true,
diff --git a/doc/API.md b/doc/API.md
index 8ea8899d56..0596eaac67 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -10,14 +10,17 @@
 	1. [API Name: axe.getRules](#api-name-axegetrules)
 	1. [API Name: axe.configure](#api-name-axeconfigure)
 	1. [API Name: axe.reset](#api-name-axereset)
-	1. [API Name: axe.a11yCheck](#api-name-axea11ycheck)
-		1. [Parameters](#parameters-2)
+	1. [API Name: axe.run](#api-name-axerun)
+		1. [Parameters axe.run](#parameters-axerun)
 			1. [Context Parameter](#context-parameter)
 			2. [Options Parameter](#options-parameter)
 			3. [Callback Parameter](#callback-parameter)
+		1. [Return Promise](#return-promise)
+		1. [Error result](#error-result)
 		1. [Results Object](#results-object)
 	1. [API Name: axe.registerPlugin](#api-name-axeregisterplugin)
 	1. [API Name: axe.cleanup](#api-name-axecleanup)
+	1. [API Name: axe.a11yCheck](#api-name-axea11ycheck)
 1. [Section 3: Example Reference](#section-3-example-reference)
 
 ## Section 1: Introduction
@@ -37,7 +40,7 @@ The aXe API can be used as part of a broader process that is performed on many,
 
 1. Load page in testing system
 2. Optionally, set configuration options for the javascript API (`axe.configure`)
-3. Call analyze javascript API (`axe.a11yCheck`)
+3. Call analyze javascript API (`axe.run`)
 4. Either assert against results or save them for later processing
 
 
@@ -107,7 +110,7 @@ To configure the format of the data used by aXe. This can be used to add new rul
 
 #### Description
 
-User specifies the format of the JSON structure passed to the callback of `axe.a11yCheck`
+User specifies the format of the JSON structure passed to the callback of `axe.run`
 
 #### Synopsis
 
@@ -128,7 +131,7 @@ axe.configure({
   * `branding` - mixed(optional) Used to set the branding of the helpUrls
      * `brand` - string(optional) sets the brand string - default "axe"
      * `application` - string(optional) sets the application string - default "axeAPI"
-  * `reporter` - Used to set the output format that the axe.a11yCheck function will pass to the callback function
+  * `reporter` - Used to set the output format that the axe.run function will pass to the callback function
      * `v1` to use the previous version's format: `axe.configure({ reporter: "v1" });`
      * `v2` to use the current version's format: `axe.configure({ reporter: "v2" });`
   * `checks` - Used to add checks to the list of checks used by rules, or to override the properties of existing checks
@@ -138,7 +141,6 @@ axe.configure({
   	 	 * `evaluate` - function(required for new). This is the function that implements the check's functionality.
   	 	 * `after` - function(optional). This is the function that gets called for checks that operate on a page-level basis, to process the results from the iframes.
   	 	 * `options` - mixed(optional). This is the options structure that is passed to the evaluate function and is intended to be used to configure checks. It is the most common property that is intended to be overridden for existing checks.
-  	 	 * `matches` - string(optional). This string will filter the nodes that are passed into the evaluate function. It is a CSS selector.
   	 	 * `enabled` - boolean(optional, default `true`). This is used to indicate whether the check is on or off by default. Checks that are off are not evaluated, even when included in a rule. Overriding this is a common way to disable a particular check across multiple rules.
   * `rules` - Used to add rules to the existing set of rules, or to override the properties of existing rules
   	 * The rules attribute is an Array of rule objects
@@ -147,7 +149,7 @@ axe.configure({
   	 	 * `selector` - string(optional, default `*`). A CSS selector used to identify the elements that are passed into the rule for evaluation.
   	 	 * `excludeHidden` - boolean(optional, default `true`). This indicates whether elements that are hidden from all users are to be passed into the rule for evaluation.
   	 	 * `enabled` - boolean(optional, default `true`). Whether the rule is turned on. This is a common attribute for overriding.
-  	 	 * `pageLevel` - boolean(optional, default `false`). This indicates whether the page operates only when the scope is the entire page. An example of a rule like this is the skip link rule. It is not recommended to override this property unless also changing the implementation.
+  	 	 * `pageLevel` - boolean(optional, default `false`). When set to true, this rule is only applied when the entire page is tested. Results from nodes on different frames are combined into a single result. See [page level rules](#page-level-rules).
   	 	 * `any` -  array(optional, default `[]`). This is the list of checks that must all "pass" or else there is a violation.
   	 	 * `all` - array(optional, default `[]`). This is the list of checks that, if any "fails", will generate a violation.
   	 	 * `none` - array(optional, default `[]`). This is a list of the checks that, if none "pass", will generate a violation.
@@ -156,6 +158,15 @@ axe.configure({
 
 **Returns:** Nothing
 
+##### Page level rules
+
+Page level rules split their evaluation into two phases. A 'data collection' phase which is done inside the 'evaluate' function and an assessment phase which is done inside the 'after' function. The evaluate function executes inside each individual frame and is responsible for collection data that is passed into the after function which inspects that data and makes a decision.
+
+Page level rules raise violations on the entire document and not on individual nodes or frames from which the data was collected. For an example of how this works, see the heading order check:
+- [lib/checks/navigation/heading-order.json](https://github.com/dequelabs/axe-core/blob/master/lib/checks/navigation/heading-order.json)
+- [lib/checks/navigation/heading-order.js](https://github.com/dequelabs/axe-core/blob/master/lib/checks/navigation/heading-order.js)
+- [lib/checks/navigation/heading-order-after.js](https://github.com/dequelabs/axe-core/blob/master/lib/checks/navigation/heading-order-after.js)
+
 ### API Name: axe.reset
 
 #### Purpose
@@ -176,7 +187,8 @@ axe.reset();
 
 None
 
-### API Name: axe.a11yCheck
+
+### API Name: axe.run
 
 #### Purpose
 
@@ -189,26 +201,28 @@ Runs a number of rules against the provided HTML page and returns the resulting
 #### Synopsis
 
 ```javascript
-axe.a11yCheck(context, options, callback);
+axe.run(context, options, callback);
 ```
 
-#### Parameters
+#### Parameters axe.run
 
-* [`context`](#context-parameter): Defines the scope of the analysis - the part of the DOM that you would like to analyze. This will typically be the `document` or a specific selector such as class name, ID, selector, etc.
-* [`options`](#options-parameter): (optional) Set of options passed into rules or checks, temporarily modifying them. This contrasts with `axe.configure`, which is more permanent. [See below for more information](#a11ycheck-parameters)
-* [`callback`](#callback-parameter): The callback function which receives on the [results object](#results-object) as a parameter when analysis is complete
+* [`context`](#context-parameter): (optional) Defines the scope of the analysis - the part of the DOM that you would like to analyze. This will typically be the `document` or a specific selector such as class name, ID, selector, etc.
+* [`options`](#options-parameter): (optional) Set of options passed into rules or checks, temporarily modifying them. This contrasts with `axe.configure`, which is more permanent. [See below for more information](#axerun-parameters)
+* [`callback`](#callback-parameter): (optional) The callback function which receives either null or an [error result](#error-result) as the first parameter, and the [results object](#results-object) when analysis is completed successfully, or undefined if it did not.
 
 ##### Context Parameter
 
-The context object can be passed one of the following:
+By default, axe.run will test the entire document. The context object is an optional parameter that can be used to specify which element should and which should not be tested. It can be passed one of the following:
 
 1. An element reference that represents the portion of the document that must be analyzed
 	* Example: To limit analysis to the `<div id="content">` element: `document.getElementById("content")`
-2. A CSS selector that selects the portion(s) of the document that must be analyzed. This includes:
+2. A NodeList such as returned by `document.querySelectorAll`.
+3. A CSS selector that selects the portion(s) of the document that must be analyzed. This includes:
 	*  A CSS selector as a class name  (e.g. `.classname`)
 	*  A CSS selector as a node name (e.g. `div`)
 	*  A CSS selector of an element id (e.g. `#tag`)
-3. An include-exclude object (see below)
+4. An include-exclude object (see below)
+
 
 ###### Include-Exclude Object
 
@@ -280,7 +294,7 @@ In most cases, the component arrays will contain only one CSS selector. Multiple
 
 ##### Options Parameter
 
-The options parameter is flexible way to configure how `a11yCheck` operates. The different modes of operation are:
+The options parameter is flexible way to configure how `axe.run` operates. The different modes of operation are:
 
 * Run all rules corresponding to one of the accessibility standards
 * Run all rules defined in the system, except for the list of rules specified
@@ -338,7 +352,7 @@ The options parameter is flexible way to configure how `a11yCheck` operates. The
 
 3. Run all enabled Rules except for a list of rules
 
-	The default operation for a11yCheck is to run all WCAG 2.0 Level A and Level AA rules. If certain rules should be disabled from being run, specify `options` as:
+	The default operation for axe.run is to run all WCAG 2.0 Level A and Level AA rules. If certain rules should be disabled from being run, specify `options` as:
 	```javascript
 	{
 	  "rules": {
@@ -387,7 +401,16 @@ The options parameter is flexible way to configure how `a11yCheck` operates. The
 
 ##### Callback Parameter
 
-The callback parameter is a function that will be called when the asynchronous `axe.a11yCheck` function completes. The callback function is passed a single parameter - the results object of the `axe.a11yCheck` call.
+The callback parameter is a function that will be called when the asynchronous `axe.run` function completes. The callback function is passed two parameters. The first parameter will be an error thrown inside of aXe if axe.run could not complete. If axe completed correctly the first parameter will be null, and the second parameter will be the results object.
+
+
+#### Return Promise
+
+If the callback was not defined, aXe will return a Promise instead. Axe does not polyfill a Promise library however. So on systems without support for Promises this feature is not available. If you are unsure if the systems you will need aXe on has Promise support we suggest you use the callback provided by axe.run instead.
+
+#### Error Result
+
+This will either be null or an object which is an instance of Error. If you are consistently receiving errors, please report this issue on the [Github issues list of Axe](https://github.com/dequelabs/axe-core/issues).
 
 
 #### Results Object
@@ -402,7 +425,15 @@ The URL of the page that was tested.
 
 The date and time that analysis was completed.
 
-###### `passes` and `violations` array
+###### result arrays
+
+The results of axe are grouped according to their outcome into the following arrays:
+* `passes`: These results indicate what elements passed the rules
+* `violations`: These results indicate what elements failed the rules
+* `inapplicable`: These results indicate which rules did not run because no matching content was found on the page. For example, with no video, those rules won't run.
+* `incomplete`: These results were aborted and require further testing. This can happen either because of technical restrictions to what the rule can test, or because a javascript error occurred.
+
+Each object returned in these arrays have the following properties:
 
 * `description` - Text string that describes what the rule does
 * `help` - Help text that describes the test that was performed
@@ -430,7 +461,8 @@ The date and time that analysis was completed.
 In this example, we will pass the selector for the entire document, pass no options, which means all enabled rules will be run, and have a simple callback function that logs the entire results object to the console log:
 
 ```javascript
-axe.a11yCheck(document, function(results) {
+axe.run(document, function(err, results) {
+  if (err) throw err;
   console.log(results);
 });
 ```
@@ -469,7 +501,7 @@ In the example above, the `passes` array contains two entries that correspond to
 
 This indicates that the element selected by the entry in `target[0]` was checked for the color contrast rule and that it passed the test.
 
-Each subsequent entry in the passes array has the same format, but will detail the different rules that were run as part of this call to `axe.a11yCheck()`.
+Each subsequent entry in the passes array has the same format, but will detail the different rules that were run as part of this call to `axe.run()`.
 
 ##### `violations` Results Array
 
@@ -477,7 +509,7 @@ The array of `violations` contains one entry; this entry describes a test that c
 
 The `target` array demonstrates how we specify the selectors when the node specified is inside of an `iframe` or `frame`. The first element in the `target` array - `target[0]` - specifies the selector to the `iframe` that contains the button. The second element in the `target` array - `target[1]` -  specifies the selector to the actual button, but starting from inside the iframe selected in `target[0]`.
 
-Each subsequent entry in the violations array has the same format, but will detail the different rules that were run that generated accessibility violations as part of this call to `axe.a11yCheck()`.
+Each subsequent entry in the violations array has the same format, but will detail the different rules that were run that generated accessibility violations as part of this call to `axe.run()`.
 
 
 #### Example 3
@@ -485,12 +517,13 @@ Each subsequent entry in the violations array has the same format, but will deta
 In this example, we pass the selector for the entire document, enable two additional best practice rules, and have a simple callback function that logs the entire results object to the console log:
 
 ```javascript
-axe.a11yCheck(document, {
+axe.run(document, {
   rules: {
     "heading-order": { enabled: true },
     "label-title-only": { enabled: true }
   }
-}, function(results) {
+}, function(err, results) {
+  if (err) throw err;
   console.log(results);
 });
 ```
@@ -502,6 +535,13 @@ Register a plugin with the aXe plugin system. See [implementing a plugin](plugin
 
 Call the plugin system's cleanup function. See [implementing a plugin](plugins.md).
 
+### API Name: axe.a11yCheck
+
+In axe-core v1 the main method for axe was `axe.a11yCheck()`. This method was replaced with `axe.run()` in order to better deal with errors. The method `axe.a11yCheck()` differs from `axe.run()` in the following ways:
+
+- .a11yCheck does not pass the error object to the callback, rather it returns the result as the first parameter and logs errors to the console.
+- .a11yCheck requires a context object, and so will not fall back to the document root.
+- .a11yCheck does not return a Promise.
 
 ## Section 3: Example Reference
 
diff --git a/doc/developer-guide.md b/doc/developer-guide.md
index 4882481bbf..6d8da87670 100644
--- a/doc/developer-guide.md
+++ b/doc/developer-guide.md
@@ -31,7 +31,7 @@ You can also load tests in any supported browser, which is helpful for debugging
 
 aXe tests for accessibility using objects called Rules. Each Rule tests for a high-level aspect of accessibility, such as color contrast, button labels, and alternate text for images. Each rule is made up of a series of Checks. Depending on the rule; all, some, or none of these checks must pass in order for the rule to pass.
 
-Upon execution, a Rule runs each of its Checks against all relevant nodes. Which nodes are relevant is determined by the Rule's `selector` property and `matches` function.  A Check can also further limit which nodes it applies to by specifying a `selector` property or `matches` function.  If a Rule has no Checks that apply to a given node, the Rule will neither pass or fail.
+Upon execution, a Rule runs each of its Checks against all relevant nodes. Which nodes are relevant is determined by the Rule's `selector` property and `matches` function. If a Rule has no Checks that apply to a given node, the Rule will result in an inapplicable result.
 
 After execution, a Check will return `true` or `false` depending on whether or not the tested condition was satisfied. The result, as well as more information on what caused the Check to pass or fail, will be stored in either the `passes` array or the `violations` array.
 
@@ -71,8 +71,7 @@ Similar to Rules, Checks are defined by JSON files in the [lib/checks directory]
 
 * `id` - `String` A unique name of the Check
 * `evaluate` - `String` Relative path to the JavaScript file which contains the function body of the Check itself
-* `after` - **optional** `String` Relative path to the JavaScript file which contains the function body of a Check's after (or post-processing) function.
-* `matches` - **optional** `String`  Relative path to the JavaScript file of a custom matching function.  It is functionally the same as a Rule's matches function.  See [matches function](#matches-function) for more information.
+* `after` - **optional** `String` Relative path to the JavaScript file which contains the function body of a Check's after (or post-processing) function.f
 * `options` - **optional** `Mixed` Any information the Check needs that you might need to customize and/or is locale specific.  Options can be overridden at runtime (with the options parameter) or config-time.  For example, the [valid-lang](../lib/checks/language/valid-lang.json) Check defines what ISO 639-1 language codes it should accept as valid.  Options do not need to follow any specific format or type; it is up to the author of a Check to determine the most appropriate format.
 * `metadata` - `Object` Consisting of:
 	* `impact` - `String` (one of `minor`, `moderate`, `serious`, or `critical`)
diff --git a/doc/examples/jasmine/README.md b/doc/examples/jasmine/README.md
index 6970879f7f..a8a1f468bb 100644
--- a/doc/examples/jasmine/README.md
+++ b/doc/examples/jasmine/README.md
@@ -28,10 +28,10 @@ failures.
 To run the example on your own HTML, such as widgets or controls, insert the
 HTML into the document, retrieve the root element of your widget (with e.g.,
 `document.getElementById()`), and pass that as the first argument into a call
-to `axe.a11yCheck`.  
+to `axe.run`.  
 
-The third argument to the `axe.a11yCheck` call should be the function to test
+The third argument to the `axe.run` call should be the function to test
 the results. The example is simply looking at the count of violations, but much
 more detailed information is available if desired.  The aXe documentation
 should be consulted for more details on customizing and analyzing calls to
-`axe.a11yCheck`.
+`axe.run`.
diff --git a/doc/examples/jasmine/spec/a11y.js b/doc/examples/jasmine/spec/a11y.js
index 665be1b100..3f26e11da5 100644
--- a/doc/examples/jasmine/spec/a11y.js
+++ b/doc/examples/jasmine/spec/a11y.js
@@ -14,7 +14,8 @@ describe('axe', function () {
 
 	it('should report that good HTML is good', function (done) {
 		var n = document.getElementById('working');
-		axe.a11yCheck(n, null, function (result) {
+		axe.run(n, function (err, result) {
+			expect(err).toBe(null);
 			expect(result.violations.length).toBe(0);
 			done();
 		});
@@ -22,7 +23,8 @@ describe('axe', function () {
 
 	it('should report that bad HTML is bad', function (done) {
 		var n = document.getElementById('broken');
-		axe.a11yCheck(n, null, function (result) {
+		axe.run(n, function (err, result) {
+			expect(err).toBe(null);
 			expect(result.violations.length).toBe(1);
 			done();
 		});
diff --git a/doc/examples/mocha/README.md b/doc/examples/mocha/README.md
index eb8904e6b8..e15ded6e93 100644
--- a/doc/examples/mocha/README.md
+++ b/doc/examples/mocha/README.md
@@ -28,10 +28,10 @@ failures.
 To run the example on your own HTML, such as widgets or controls, insert the
 HTML into the document, retrieve the root element of your widget (with e.g.,
 `document.getElementById()`), and pass that as the first argument into a call
-to `axe.a11yCheck`.  
+to `axe.run`.  
 
-The third argument to the `axe.a11yCheck` call should be the function to test
+The third argument to the `axe.run` call should be the function to test
 the results. The example is simply looking at the count of violations, but much
 more detailed information is available if desired.  The aXe documentation
 should be consulted for more details on customizing and
-analyzing calls to `axe.a11yCheck`.
+analyzing calls to `axe.run`.
diff --git a/doc/examples/mocha/test/a11y.js b/doc/examples/mocha/test/a11y.js
index b0abaa6ef5..6a65ff05bc 100644
--- a/doc/examples/mocha/test/a11y.js
+++ b/doc/examples/mocha/test/a11y.js
@@ -5,7 +5,8 @@ describe('axe', function () {
 
 	it('should report that good HTML is good', function (done) {
 		var n = document.getElementById('working');
-		axe.a11yCheck(n, null, function (result) {
+		axe.run(n, function (err, result) {
+			expect(err).to.be.null();
 			expect(result.violations.length).to.equal(0);
 			done();
 		});
@@ -13,7 +14,8 @@ describe('axe', function () {
 
 	it('should report that bad HTML is bad', function (done) {
 		var n = document.getElementById('broken');
-		axe.a11yCheck(n, null, function (result) {
+		axe.run(n, function (err, result) {
+			expect(err).to.be.null();
 			expect(result.violations.length).to.equal(1);
 			done();
 		});
diff --git a/doc/examples/phantomjs/axe-phantom.js b/doc/examples/phantomjs/axe-phantom.js
index d1d3f71b33..3f4a62576f 100644
--- a/doc/examples/phantomjs/axe-phantom.js
+++ b/doc/examples/phantomjs/axe-phantom.js
@@ -1,4 +1,4 @@
-/*global phantom */
+/*global window, phantom */
 var PATH_TO_AXE = 'node_modules/axe-core/axe.min.js';
 
 var args = require('system').args;
@@ -24,8 +24,11 @@ page.open(args[1], function (status) {
 	});
 	page.switchToMainFrame();
 	page.evaluateAsync(function () {
-		/*global window, axe */
-		axe.a11yCheck(window.document, null, function (results) {
+		/*global axe */
+		axe.run(function (err, results) {
+			if (err)  {
+				throw err;
+			}
 			window.callPhantom(results);
 		});
 	});
diff --git a/doc/examples/qunit/README.md b/doc/examples/qunit/README.md
index 115e2ccaf2..deaa8536ea 100644
--- a/doc/examples/qunit/README.md
+++ b/doc/examples/qunit/README.md
@@ -28,10 +28,10 @@ failures.
 To run the example on your own HTML, such as widgets or controls, insert the
 HTML into the document, retrieve the root element of your widget (with e.g.,
 `document.getElementById()`), and pass that as the first argument into a call
-to `axe.a11yCheck`.  
+to `axe.run`.  
 
-The third argument to the `axe.a11yCheck` call should be the function to test
+The third argument to the `axe.run` call should be the function to test
 the results. The example is simply looking at the count of violations, but much
 more detailed information is available if desired.  The aXe documentation
 should be consulted for more details on customizing and
-analyzing calls to `axe.a11yCheck`.
+analyzing calls to `axe.run`.
diff --git a/doc/examples/qunit/test/a11y.js b/doc/examples/qunit/test/a11y.js
index da28ea30b1..53020f3f80 100644
--- a/doc/examples/qunit/test/a11y.js
+++ b/doc/examples/qunit/test/a11y.js
@@ -5,7 +5,8 @@ module('axe');
 asyncTest('should report that good HTML is good', function (assert) {
 	var n = document.getElementById('working');
 	expect(1);
-	axe.a11yCheck(n, null, function (result) {
+	axe.run(n, function (err, result) {
+		assert.equal(err, null);
 		assert.equal(result.violations.length, 0);
 		start();
 	});
@@ -14,7 +15,8 @@ asyncTest('should report that good HTML is good', function (assert) {
 asyncTest('should report that bad HTML is bad', function (assert) {
 	var n = document.getElementById('broken');
 	expect(1);
-	axe.a11yCheck(n, null, function (result) {
+	axe.run(n, function (err, result) {
+		assert.equal(err, null);
 		assert.equal(result.violations.length, 1);
 		start();
 	});
diff --git a/doc/examples/selenium/README.md b/doc/examples/selenium/README.md
index 284eced34a..b4d3086724 100644
--- a/doc/examples/selenium/README.md
+++ b/doc/examples/selenium/README.md
@@ -33,4 +33,4 @@ so simply edit that property to put in the URLs you wish to test.
 
 The example is simply logging the analysis results to files.  The aXe
 documentation should be consulted for more details on customizing and
-analyzing calls to `axe.a11yCheck`.
+analyzing calls to `axe.run`.
diff --git a/doc/plugins.md b/doc/plugins.md
index 362bc31bdf..6d123bb36b 100644
--- a/doc/plugins.md
+++ b/doc/plugins.md
@@ -20,7 +20,7 @@ In order to create such a plugin, we need to implement the "run" function for th
 
 #### Basic plugin
 
-```
+```javascript
 axe.registerPlugin({
 	id: 'doStuff',
 	run: function (id, action, options, callback) {
@@ -29,28 +29,25 @@ axe.registerPlugin({
 		var that = this;
 		frames = axe.utils.toArray(document.querySelectorAll('iframe, frame'));
 
-		if (frames.length) {
-			frames.forEach(function (frame) {
-			  q.defer(function (done) {
-				axe.utils.sendCommandToFrame(frame, {
-					options: options,
-					command: 'run-doStuff',
-					parameter: id,
-					action: action
-				}, function () {
-					done();
-				});
-			  });
+		frames.forEach(function (frame) {
+		  q.defer(function (done) {
+			axe.utils.sendCommandToFrame(frame, {
+				options: options,
+				command: 'run-doStuff',
+				parameter: id,
+				action: action
+			}, function () {
+				done();
 			});
-		}
+		  });
+		});
+
 		if (!options.context.length) {
 			q.defer(function (done) {
 				that._registry[id][action].call(that._registry[id], document, options, done);
 			});
 		}
-		q.then(function () {
-			callback();
-		});
+		q.then(callback);
 	},
 	commands: [{
 	  id: 'run-doStuff',
@@ -65,9 +62,9 @@ Looking at the code, you will see the following things:
 
 1. The plugin contains an id. This id is then used to access the plugin and its implementations.
 2. The plugin is registered with aXe (in each iframe) using the `axe.registerPlugin()` function.
-3. The plugin registers the "run" function and the "commands" with the aXe system. This allows plugin implementations to be registered with the plugin, and to be executed. It also registers handlers for eachof the commands within each of the iframes, so that the plugin can coordinate with itself accross the iframe boundaries.
+3. The plugin registers the "run" function and the "commands" with the aXe system. This allows plugin implementations to be registered with the plugin, and to be executed. It also registers handlers for each of the commands within each of the iframes, so that the plugin can coordinate with itself across the iframe boundaries.
 
-When the caller wants to call a plugin instance, it does so by callin the plugin's "run" function in the top level document and passing the id of the plugin instance it would like to call, which plugin instance action it would like to call, the options and a callback function.
+When the caller wants to call a plugin instance, it does so by calling the plugin's "run" function in the top level document and passing the id of the plugin instance it would like to call, which plugin instance action it would like to call, the options and a callback function.
 
 The plugin takes this information and sends the same instructions to its implementation in each iframe by communicating to its own command(s) using the aXe utility function `axe.utils.sendCommandToFrame()`.
 
@@ -83,7 +80,7 @@ Once all the iframes' run functions have been executed, the callback is called.
 
 Lets implement a basic plugin instance to see how this works. This instance will implement a "highlight" function (to place a basic frame around the bounding box of an element on each iframe on a page)
 
-```
+```javascript
   var highlight = {
     id: 'highlight',
     highlighter: new Highlighter(),
diff --git a/doc/rule-descriptions.md b/doc/rule-descriptions.md
index f331f318d6..d2b3f3d15d 100644
--- a/doc/rule-descriptions.md
+++ b/doc/rule-descriptions.md
@@ -20,7 +20,8 @@
 | document-title | Ensures each HTML document contains a non-empty &lt;title&gt; element | wcag2a, wcag242 | true |
 | duplicate-id | Ensures every id attribute value is unique | wcag2a, wcag411 | true |
 | empty-heading | Ensures headings have discernible text | best-practice | true |
-| frame-title | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain a unique and non-empty title attribute | wcag2a, wcag241, section508, section508.22.i | true |
+| frame-title-unique | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain a unique title attribute | best-practice | true |
+| frame-title | Ensures &lt;iframe&gt; and &lt;frame&gt; elements contain a non-empty title attribute | wcag2a, wcag241, section508, section508.22.i | true |
 | heading-order | Ensures the order of headings is semantically correct | best-practice | false |
 | href-no-hash | Ensures that href values are valid link references to promote only using anchors as links | best-practice | false |
 | html-has-lang | Ensures every HTML document has a lang attribute | wcag2a, wcag311 | true |
diff --git a/lib/.jshintrc b/lib/.jshintrc
index 39debedf7b..ece2d36338 100644
--- a/lib/.jshintrc
+++ b/lib/.jshintrc
@@ -27,7 +27,7 @@
 	"regexp": true,
 	"undef": true,
 	"unused": true,
-	"strict": true,
+	"strict": false,
 	"trailing": true,
 
 	"maxparams": 6,
diff --git a/lib/checks/aria/allowed-attr.json b/lib/checks/aria/allowed-attr.json
index 19792a7a69..8edab405b4 100644
--- a/lib/checks/aria/allowed-attr.json
+++ b/lib/checks/aria/allowed-attr.json
@@ -1,6 +1,5 @@
 {
   "id": "aria-allowed-attr",
-  "matches": "allowed-attr-matches.js",
   "evaluate": "allowed-attr.js",
   "metadata": {
     "impact": "critical",
diff --git a/lib/checks/aria/valid-attr-value.json b/lib/checks/aria/valid-attr-value.json
index 62ea62eb62..621589b710 100644
--- a/lib/checks/aria/valid-attr-value.json
+++ b/lib/checks/aria/valid-attr-value.json
@@ -1,6 +1,5 @@
 {
   "id": "aria-valid-attr-value",
-  "matches": "has-attr-matches.js",
   "evaluate": "valid-attr-value.js",
   "options": [],
   "metadata": {
diff --git a/lib/checks/aria/valid-attr.json b/lib/checks/aria/valid-attr.json
index c31d0831a1..d51ac94d21 100644
--- a/lib/checks/aria/valid-attr.json
+++ b/lib/checks/aria/valid-attr.json
@@ -1,6 +1,5 @@
 {
   "id": "aria-valid-attr",
-  "matches": "has-attr-matches.js",
   "evaluate": "valid-attr.js",
   "options": [],
   "metadata": {
diff --git a/lib/checks/color/color-contrast.js b/lib/checks/color/color-contrast.js
index 42b76c5827..2659faee55 100644
--- a/lib/checks/color/color-contrast.js
+++ b/lib/checks/color/color-contrast.js
@@ -9,7 +9,7 @@ var bgNodes = [],
 
 //We don't know, so we'll pass it provisionally
 if (fgColor === null || bgColor === null) {
-	return true;
+	return undefined;
 }
 
 var nodeStyle = window.getComputedStyle(node);
diff --git a/lib/checks/color/color-contrast.json b/lib/checks/color/color-contrast.json
index 5ed097ceb1..c4ccbe613f 100644
--- a/lib/checks/color/color-contrast.json
+++ b/lib/checks/color/color-contrast.json
@@ -1,6 +1,5 @@
 {
   "id": "color-contrast",
-  "matches": "color-contrast-matches.js",
   "evaluate": "color-contrast.js",
   "metadata": {
     "impact": "critical",
diff --git a/lib/checks/color/link-in-text-block.js b/lib/checks/color/link-in-text-block.js
index 8dda19a4c6..7d27518413 100644
--- a/lib/checks/color/link-in-text-block.js
+++ b/lib/checks/color/link-in-text-block.js
@@ -35,8 +35,15 @@ if (color.elementIsDistinct(node, parentBlock)) {
 	nodeColor = color.getForegroundColor(node);
 	parentColor = color.getForegroundColor(parentBlock);
 
-	if (!nodeColor || !parentColor || getContrast(nodeColor, parentColor) >= 3.0) {
+	if (!nodeColor || !parentColor) {
+		return undefined;
+	}
+
+	var contrast = getContrast(nodeColor, parentColor);
+	if (contrast === 1) {
 		return true;
+	} else if (contrast >= 3.0) {
+		return undefined;
 	}
 
 	// Check if contrast of background is sufficient
@@ -44,7 +51,7 @@ if (color.elementIsDistinct(node, parentBlock)) {
 	parentColor = color.getBackgroundColor(parentBlock);
 
 	if (!nodeColor || !parentColor || getContrast(nodeColor, parentColor) >= 3.0) {
-		return true;
+		return undefined;
 	}
 
 }
diff --git a/lib/checks/label/explicit.js b/lib/checks/label/explicit.js
index 05070c7629..4bc5bdf082 100644
--- a/lib/checks/label/explicit.js
+++ b/lib/checks/label/explicit.js
@@ -1,6 +1,7 @@
-
-var label = document.querySelector('label[for="' + axe.commons.utils.escapeSelector(node.id) + '"]');
-if (label) {
-	return !!axe.commons.text.accessibleText(label);
+if (node.id) {
+	var label = document.querySelector('label[for="' + axe.commons.utils.escapeSelector(node.id) + '"]');
+	if (label) {
+		return !!axe.commons.text.accessibleText(label);
+	}
 }
 return false;
diff --git a/lib/checks/label/explicit.json b/lib/checks/label/explicit.json
index 88397cb1b2..e5fd1970db 100644
--- a/lib/checks/label/explicit.json
+++ b/lib/checks/label/explicit.json
@@ -1,7 +1,6 @@
 {
   "id": "explicit-label",
   "evaluate": "explicit.js",
-  "selector": "[id]",
   "metadata": {
     "impact": "critical",
     "messages": {
diff --git a/lib/checks/navigation/header-present.json b/lib/checks/navigation/header-present.json
index a800aca6e0..2401ffdd09 100644
--- a/lib/checks/navigation/header-present.json
+++ b/lib/checks/navigation/header-present.json
@@ -1,6 +1,5 @@
 {
   "id": "header-present",
-  "selector": "html",
   "evaluate": "header-present.js",
   "metadata": {
     "impact": "moderate",
diff --git a/lib/checks/navigation/internal-link-present.json b/lib/checks/navigation/internal-link-present.json
index 322eb1175d..6fbb6a52e9 100644
--- a/lib/checks/navigation/internal-link-present.json
+++ b/lib/checks/navigation/internal-link-present.json
@@ -1,6 +1,5 @@
 {
   "id": "internal-link-present",
-  "selector": "html",
   "evaluate": "internal-link-present.js",
   "metadata": {
     "impact": "critical",
diff --git a/lib/checks/navigation/landmark.js b/lib/checks/navigation/landmark.js
index a18028db5d..6739a2bcc1 100644
--- a/lib/checks/navigation/landmark.js
+++ b/lib/checks/navigation/landmark.js
@@ -1 +1 @@
-return !!node.querySelector('[role="main"]');
+return node.getElementsByTagName('main').length > 0 || !!node.querySelector('[role="main"]') ;
\ No newline at end of file
diff --git a/lib/checks/navigation/landmark.json b/lib/checks/navigation/landmark.json
index 2d95d5e8e2..23ce45ba3f 100644
--- a/lib/checks/navigation/landmark.json
+++ b/lib/checks/navigation/landmark.json
@@ -1,6 +1,5 @@
 {
   "id": "landmark",
-  "selector": "html",
   "evaluate": "landmark.js",
   "metadata": {
     "impact": "serious",
diff --git a/lib/checks/navigation/skip-link.json b/lib/checks/navigation/skip-link.json
index 37db1caf97..87e8d38fdc 100644
--- a/lib/checks/navigation/skip-link.json
+++ b/lib/checks/navigation/skip-link.json
@@ -1,6 +1,5 @@
 {
   "id": "skip-link",
-  "selector": "a[href]",
   "evaluate": "skip-link.js",
   "after": "skip-link-after.js",
   "metadata": {
diff --git a/lib/checks/navigation/unique-frame-title-after.js b/lib/checks/navigation/unique-frame-title-after.js
index c6465cdfed..fb9f221f8e 100644
--- a/lib/checks/navigation/unique-frame-title-after.js
+++ b/lib/checks/navigation/unique-frame-title-after.js
@@ -2,7 +2,8 @@ var titles = {};
 results.forEach(function (r) {
 	titles[r.data] = titles[r.data] !== undefined ? ++titles[r.data] : 0;
 });
+results.forEach(function (r) {
+	r.result = !!titles[r.data];
+});
 
-return results.filter(function (r) {
-	return !!titles[r.data];
-});
\ No newline at end of file
+return results;
\ No newline at end of file
diff --git a/lib/checks/navigation/unique-frame-title.js b/lib/checks/navigation/unique-frame-title.js
index c468075195..fc68f08fa2 100644
--- a/lib/checks/navigation/unique-frame-title.js
+++ b/lib/checks/navigation/unique-frame-title.js
@@ -1,2 +1,3 @@
-this.data(node.title);
+var title = axe.commons.text.sanitize(node.title).trim().toLowerCase();
+this.data(title);
 return true;
\ No newline at end of file
diff --git a/lib/checks/shared/aria-labelledby.js b/lib/checks/shared/aria-labelledby.js
index 91b10c384d..10f6ba842f 100644
--- a/lib/checks/shared/aria-labelledby.js
+++ b/lib/checks/shared/aria-labelledby.js
@@ -1,11 +1,5 @@
-var results = axe.commons.dom.idrefs(node, 'aria-labelledby');
-var element, i, l = results.length;
+var getIdRefs = axe.commons.dom.idrefs;
 
-for (i = 0; i < l; i++) {
-	element = results[i];
-	if (element && axe.commons.text.accessibleText(element, true)) {
-		return true;
-	}
-}
-
-return false;
+return getIdRefs(node, 'aria-labelledby').some(function (elm) {
+	return (elm && axe.commons.text.accessibleText(elm, true));
+});
diff --git a/lib/checks/shared/button-has-visible-text.js b/lib/checks/shared/button-has-visible-text.js
new file mode 100644
index 0000000000..64eea0e629
--- /dev/null
+++ b/lib/checks/shared/button-has-visible-text.js
@@ -0,0 +1,13 @@
+let nodeName = node.nodeName.toUpperCase();
+let role = node.getAttribute('role');
+let label;
+
+if (nodeName === 'BUTTON' || (role === 'button' && nodeName !== 'INPUT')) {
+	label = axe.commons.text.accessibleText(node);
+	this.data(label);
+
+	return !!label;
+} else {
+
+	return false;
+}
\ No newline at end of file
diff --git a/lib/checks/shared/button-has-visible-text.json b/lib/checks/shared/button-has-visible-text.json
index 5e2a3e13e3..dcb868cba8 100644
--- a/lib/checks/shared/button-has-visible-text.json
+++ b/lib/checks/shared/button-has-visible-text.json
@@ -1,7 +1,6 @@
 {
   "id": "button-has-visible-text",
-  "evaluate": "has-visible-text.js",
-  "selector": "button, [role=\"button\"]:not(input)",
+  "evaluate": "button-has-visible-text.js",
   "metadata": {
     "impact": "critical",
     "messages": {
diff --git a/lib/checks/shared/has-visible-text.js b/lib/checks/shared/has-visible-text.js
index 0c63a06d61..f985e913a5 100644
--- a/lib/checks/shared/has-visible-text.js
+++ b/lib/checks/shared/has-visible-text.js
@@ -1 +1 @@
-return axe.commons.text.accessibleText(node).length > 0;
+return axe.commons.text.accessibleText(node).length > 0;
\ No newline at end of file
diff --git a/lib/checks/shared/non-empty-if-present.js b/lib/checks/shared/non-empty-if-present.js
index a2a40e5aca..ea9fd78bdc 100644
--- a/lib/checks/shared/non-empty-if-present.js
+++ b/lib/checks/shared/non-empty-if-present.js
@@ -1,3 +1,11 @@
-var label = node.getAttribute('value');
+// Check for 'default' names, which are given to reset and submit buttons
+let nodeName = node.nodeName.toUpperCase();
+let type = (node.getAttribute('type') || '').toLowerCase();
+let label = node.getAttribute('value');
+
 this.data(label);
-return label === null || axe.commons.text.sanitize(label).trim() !== '';
+
+if (nodeName === 'INPUT' && ['submit', 'reset'].indexOf(type) !== -1) {
+	return label === null;
+}
+return false;
\ No newline at end of file
diff --git a/lib/checks/shared/non-empty-if-present.json b/lib/checks/shared/non-empty-if-present.json
index 9f63176049..7896e90501 100644
--- a/lib/checks/shared/non-empty-if-present.json
+++ b/lib/checks/shared/non-empty-if-present.json
@@ -1,7 +1,6 @@
 {
   "id": "non-empty-if-present",
   "evaluate": "non-empty-if-present.js",
-  "selector": "[type=\"submit\"], [type=\"reset\"]",
   "metadata": {
     "impact": "critical",
     "messages": {
diff --git a/lib/checks/shared/non-empty-value.js b/lib/checks/shared/non-empty-value.js
index 68b325b520..a08bff4ab5 100644
--- a/lib/checks/shared/non-empty-value.js
+++ b/lib/checks/shared/non-empty-value.js
@@ -1,2 +1,2 @@
 var label = node.getAttribute('value');
-return !!(label ? axe.commons.text.sanitize(label).trim() : '');
+return !!(label ? axe.commons.text.sanitize(label).trim() : '');
\ No newline at end of file
diff --git a/lib/checks/shared/non-empty-value.json b/lib/checks/shared/non-empty-value.json
index 3bb182a924..94f301fed0 100644
--- a/lib/checks/shared/non-empty-value.json
+++ b/lib/checks/shared/non-empty-value.json
@@ -1,7 +1,6 @@
 {
   "id": "non-empty-value",
   "evaluate": "non-empty-value.js",
-  "selector": "[type=\"button\"]",
   "metadata": {
     "impact": "critical",
     "messages": {
diff --git a/lib/checks/tables/caption-faked.js b/lib/checks/tables/caption-faked.js
index cad02bedcc..af96d702a2 100644
--- a/lib/checks/tables/caption-faked.js
+++ b/lib/checks/tables/caption-faked.js
@@ -1,4 +1,4 @@
-var table = axe.commons.table.toArray(node);
+var table = axe.commons.table.toGrid(node);
 var firstRow = table[0];
 
 if (table.length <= 1 || firstRow.length <= 1 || node.rows.length <= 1) {
diff --git a/lib/checks/tables/same-caption-summary.json b/lib/checks/tables/same-caption-summary.json
index ac66398c1e..a3b0c2aca1 100644
--- a/lib/checks/tables/same-caption-summary.json
+++ b/lib/checks/tables/same-caption-summary.json
@@ -1,6 +1,5 @@
 {
   "id": "same-caption-summary",
-  "selector": "table",
   "evaluate": "same-caption-summary.js",
   "metadata": {
     "impact": "moderate",
diff --git a/lib/checks/tables/td-has-header.js b/lib/checks/tables/td-has-header.js
index 6f8996b733..84974c1446 100644
--- a/lib/checks/tables/td-has-header.js
+++ b/lib/checks/tables/td-has-header.js
@@ -1,25 +1,25 @@
-var row, cell,
-	badCells = [];
+var tableUtils = axe.commons.table;
+var badCells = [];
+var cells = tableUtils.getAllCells(node);
 
-for (var rowIndex = 0, rowLength = node.rows.length; rowIndex < rowLength; rowIndex++) {
-	row = node.rows[rowIndex];
-	for (var cellIndex = 0, cellLength = row.cells.length; cellIndex < cellLength; cellIndex++) {
-		cell = row.cells[cellIndex];
+cells.forEach((cell) => {
+	// For each non-empty data cell that doesn't have an aria label
+	if (cell.textContent.trim() !== '' &&
+		tableUtils.isDataCell(cell) &&
+		!axe.commons.aria.label(cell)
+	) {
+		// Check if it has any headers
+		var hasHeaders = tableUtils.getHeaders(cell);
+		hasHeaders = hasHeaders.reduce(function (hasHeaders, header) {
+			return (hasHeaders || header !== null && !!header.textContent.trim());
+		}, false);
 
-		if (cell.textContent.trim() !== '' &&
-				axe.commons.table.isDataCell(cell) &&
-				!axe.commons.aria.label(cell)) {
-
-			var headers = axe.commons.table.getHeaders(cell)
-			.reduce(function (out, header) {
-				return (out || header !== null && !!header.textContent.trim());
-			}, false);
-			if (!headers) {
-				badCells.push(cell);
-			}
+		// If no headers, put it on the naughty list
+		if (!hasHeaders) {
+			badCells.push(cell);
 		}
 	}
-}
+});
 
 if (badCells.length) {
 	this.relatedNodes(badCells);
diff --git a/lib/checks/tables/th-has-data-cells.js b/lib/checks/tables/th-has-data-cells.js
index a89f0f877d..f0dd85ad53 100644
--- a/lib/checks/tables/th-has-data-cells.js
+++ b/lib/checks/tables/th-has-data-cells.js
@@ -1,55 +1,7 @@
-var cells = [];
+var tableUtils = axe.commons.table;
+var cells = tableUtils.getAllCells(node);
 var checkResult = this;
 
-/**
- * Traverses a table in a given direction, passing it to the callback
- * @param  {array}    table    A matrix of the table obtained using axe.commons.table.toArray
- * @param  {object}   start    x/y coordinate: {x: 0, y: 0};
- * @param  {object}   dir      Direction that will be added recursively {x: 1, y: 0};
- * @param  {Function} callback Function to which each cell will be passed
- * @return {nodeElemtn}        If the callback returns true, the traversal will end and the cell will be returned
- */
-function traverseTable(table, dir, start, callback) {
-	'use strict';
-	if (typeof start === 'function') {
-		callback = start;
-		start = {x:0, y:0};
-	}
-	if (typeof dir === 'string') {
-		switch (dir) {
-			case 'left': dir = { x: -1, y: 0 };
-				break;
-			case 'up': dir = { x: 0, y: -1 };
-				break;
-			case 'right': dir = { x: 1, y: 0 };
-				break;
-			case 'down': dir = { x: 0, y: 1 };
-				break;
-		}
-	}
-
-	var cell = (table[start.y] ? table[start.y][start.x] : undefined);
-	if (!cell) {
-		return;
-	}
-
-	if (callback(cell) === true) {
-		return cell;
-	}
-
-	return traverseTable(table, dir, {
-		x: start.x + dir.x,
-		y: start.y + dir.y
-	}, callback);
-}
-
-
-// Get all the cells
-for (var rowIndex = 0, rowLength = node.rows.length; rowIndex < rowLength; rowIndex++) {
-	for (var cellIndex = 0, cellLength = node.rows[rowIndex].cells.length; cellIndex < cellLength; cellIndex++) {
-		cells.push(node.rows[rowIndex].cells[cellIndex]);
-	}
-}
 
 // Get a list of all headers reffed to in this rule
 var reffedHeaders = [];
@@ -75,7 +27,8 @@ var headers = cells.filter(function (cell) {
 });
 
 
-var tableMatrix;
+var tableGrid = tableUtils.toGrid(node);
+
 // Look for all the bad headers
 return headers.reduce(function (res, header) {
 	if (header.id && reffedHeaders.indexOf(header.id) !== -1) {
@@ -83,31 +36,32 @@ return headers.reduce(function (res, header) {
 	}
 
 	var hasCell = false;
-	var pos = axe.commons.table.getCellPosition(header);
-
-	// Only get the matrix once we need it
-	tableMatrix = (tableMatrix ? tableMatrix : axe.commons.table.toArray(node));
+	var pos = tableUtils.getCellPosition(header, tableGrid);
 
 	// Look for any data cells or row headers that this might refer to
-	if (axe.commons.table.isColumnHeader(header)) {
-		pos.y += 1;
-		hasCell = !!traverseTable(tableMatrix, 'down', pos, function (cell) {
-			return !axe.commons.table.isColumnHeader(cell);
-		});
+	if (tableUtils.isColumnHeader(header)) {
+		hasCell = tableUtils.traverse('down', pos, tableGrid)
+		.reduce((out, cell) => {
+			return out || (cell.textContent.trim() !== '' &&
+				!tableUtils.isColumnHeader(cell));
+		}, false);
+	}
 
 	// Look for any data cells or column headers that this might refer to
-	} else if (axe.commons.table.isRowHeader(header)) {
-		pos.x += 1;
-		hasCell = !!traverseTable(tableMatrix, 'right', pos, function (cell) {
-			return !axe.commons.table.isRowHeader(cell);
-		});
+	if (!hasCell && tableUtils.isRowHeader(header)) {
+		hasCell = tableUtils.traverse('right', pos, tableGrid)
+		.reduce((out, cell) => {
+			return out || (cell.textContent.trim() !== '' &&
+				!tableUtils.isRowHeader(cell));
+		}, false);
 	}
 
 	// report the node as having failed
 	if (!hasCell) {
 		checkResult.relatedNodes(header);
 	}
-	return (!res ? res : hasCell);
+
+	return res && hasCell;
 
 }, true);
 
diff --git a/lib/commons/color/element-is-distinct.js b/lib/commons/color/element-is-distinct.js
index 0a1924b362..343960bd32 100644
--- a/lib/commons/color/element-is-distinct.js
+++ b/lib/commons/color/element-is-distinct.js
@@ -42,11 +42,17 @@ function elementIsDistinct(node, ancestorNode) {
 		return true;
 	}
 
-	var hasStyle = ['text-decoration', 'font-weight', 'font-style', 'font-size']
+	var hasStyle = ['text-decoration-line', 'text-decoration-style', 'font-weight', 'font-style', 'font-size']
 	.reduce(function (result, cssProp) {
 		return result || (nodeStyle.getPropertyValue(cssProp) !== parentStyle.getPropertyValue(cssProp));
 	}, false);
 
+	var tDec = nodeStyle.getPropertyValue('text-decoration');
+	if (tDec.split(' ').length < 3) {
+		// old style CSS text decoration
+		hasStyle = hasStyle || (tDec !== parentStyle.getPropertyValue('text-decoration'));
+	}
+
 	return hasStyle;
 }
 
diff --git a/lib/commons/color/get-background-color.js b/lib/commons/color/get-background-color.js
index d7ae717095..068e2e9635 100644
--- a/lib/commons/color/get-background-color.js
+++ b/lib/commons/color/get-background-color.js
@@ -1,177 +1,154 @@
-/*global dom, color */
-/* jshint maxstatements: 34, maxcomplexity: 15 */
-//TODO dsturley: too complex, needs refactor!!
-
-var graphicNodeNames = [
+/* global color, dom */
+const graphicNodes = [
 	'IMG', 'CANVAS', 'OBJECT', 'IFRAME', 'VIDEO', 'SVG'
 ];
 
-/**
- * Returns the non-alpha-blended background color of a node, null if it's an image
- * @param {Element} node
- * @return {Color}
- */
-function getBackgroundForSingleNode(node) {
-	var bgColor, bgColorString, opacity;
-	var nodeStyle = window.getComputedStyle(node);
-	var nodeName = node.nodeName.toUpperCase();
-
-	if (graphicNodeNames.indexOf(nodeName) !== -1 ||
-			nodeStyle.getPropertyValue('background-image') !== 'none') {
-		return null;
-	}
-
-	bgColorString = nodeStyle.getPropertyValue('background-color');
-	//Firefox exposes unspecified background as 'transparent' rather than rgba(0,0,0,0)
-	if (bgColorString === 'transparent') {
-		bgColor = new color.Color(0, 0, 0, 0);
-	} else {
-		bgColor = new color.Color();
-		bgColor.parseRgbString(bgColorString);
+function elmHasImage(elm, style) {
+	var nodeName = elm.nodeName.toUpperCase();
+	if (graphicNodes.includes(nodeName)) {
+		return true;
 	}
 
-	opacity = nodeStyle.getPropertyValue('opacity');
-	bgColor.alpha = bgColor.alpha * opacity;
-
-	return bgColor;
+	style = style || window.getComputedStyle(elm);
+	return style.getPropertyValue('background-image') !== 'none';
 }
 
 /**
- * Determines whether an element has a fully opaque background, whether solid color or an image
- * @param {Element} node
- * @return {Boolean} false if the background is transparent, true otherwise
- */
-dom.isOpaque = function(node) {
-	var bgColor = getBackgroundForSingleNode(node);
-	if (bgColor === null || bgColor.alpha === 1) {
-		return true;
-	}
-	return false;
-};
-
-/**
- * Returns the elements that are visually "above" this one in z-index order where
- * supported at the position given inside the top-left corner of the provided
- * rectangle. Where not supported (IE < 10), returns the DOM parents.
- * @param {Element} node
- * @param {DOMRect} rect rectangle containing dimensions to consider
- * @return {Array} array of elements
+ * Returns the non-alpha-blended background color of an element
+ * @param {Element} elm
+ * @return {Color}
  */
-var getVisualParents = function(node, rect) {
-	var visualParents, thisIndex, posVal;
-	var parents = [];
-	var currentNode = node;
-	var nodeStyle = window.getComputedStyle(currentNode);
-
-	if (dom.supportsElementsFromPoint(document)) {
-		visualParents = dom.elementsFromPoint(document,
-			Math.ceil(rect.left + 1),
-			Math.ceil(rect.top + 1),
-			node);
-		thisIndex = visualParents.indexOf(node);
-
-		// if the element is not present; then something is obscuring it thus making calculation impossible
-		if (thisIndex === -1) {
-			return null;
-
-		} else if (visualParents && (thisIndex < visualParents.length - 1)) {
-			return visualParents.slice(thisIndex + 1);
-		}
+function getBgColor(elm, elmStyle) {
+	elmStyle = elmStyle || window.getComputedStyle(elm);
+	let bgColor = new color.Color();
+	bgColor.parseRgbString( elmStyle.getPropertyValue('background-color'));
+
+	if (bgColor.alpha !== 0) {
+		let opacity = elmStyle.getPropertyValue('opacity');
+		bgColor.alpha = bgColor.alpha * opacity;
 	}
+	return bgColor;
+}
 
-	while (currentNode !== null) {
-		// If the element is positioned, we can't rely on DOM order to find visual parents
-		posVal = nodeStyle.getPropertyValue('position');
-		if (posVal !== 'static') {
-			return null;
-		}
-		currentNode = currentNode.parentElement;
-		if (currentNode !== null) {
-			nodeStyle = window.getComputedStyle(currentNode);
-			if (parseInt(nodeStyle.getPropertyValue('height'), 10) !== 0) {
-				parents.push(currentNode);
+function calculateObscuringAlpha(elmIndex, elmStack) {
+	var totalAlpha = 0;
+
+	if (elmIndex > 0) {
+		// there are elements above our element, check if they are contribute to the background
+		for (var i = elmIndex - 1; i >= 0; i--) {
+			let bgElm = elmStack[i];
+			let bgElmStyle = window.getComputedStyle(bgElm);
+			let bgColor = getBgColor(bgElm, bgElmStyle);
+			if (bgColor.alpha) {
+				totalAlpha += bgColor.alpha;
+			} else {
+				// remove elements not contributing to the background
+				elmStack.splice(i, 1);
 			}
 		}
 	}
-
-	return parents;
-};
-
-
+	return totalAlpha;
+}
 /**
- * Returns the flattened background color of an element, or null if it can't be determined because
- * there is no opaque ancestor element visually containing it, or because background images are used.
- * @param {Element} node
- * @param {Array} bgNodes array to which all encountered nodes should be appended
- * @param {Boolean} noScroll (default false)
- * @return {Color}
+ * Get all elements rendered underneath the current element, 
+ * in the order in which it is rendered
  */
-//TODO dsturley; why is this passing `bgNodes`?
-color.getBackgroundColor = function(node, bgNodes, noScroll) {
-	var parent, parentColor;
-	var bgColor = getBackgroundForSingleNode(node);
-
-	if (bgNodes && (bgColor === null || bgColor.alpha !== 0)) {
-		bgNodes.push(node);
+color.getBackgroundStack = function(elm) {
+	let rect = elm.getBoundingClientRect();
+	let x, y;
+	if (rect.left > window.innerWidth) {
+		return;
 	}
-	if (bgColor === null || bgColor.alpha === 1) {
-		return bgColor;
+	if (rect.top > window.innerWidth) {
+		return;
 	}
-
-	if(noScroll !== true) {
-		node.scrollIntoView();
+	x = Math.min(
+		Math.ceil(rect.left + (rect.width / 2)),
+		window.innerWidth - 1);
+	y = Math.min(
+			Math.ceil(rect.top + (rect.height / 2)),
+			window.innerHeight - 1);
+
+	let elmStack = document.elementsFromPoint(x, y);
+	elmStack = dom.reduceToElementsBelowFloating(elmStack, elm);
+
+	let bodyIndex = elmStack.indexOf(document.body);
+
+	if (// Check that the body background is the page's background
+		bodyIndex > 1 && // only if there are negative z-index elements
+		!elmHasImage(document.documentElement) &&
+		getBgColor(document.documentElement).alpha === 0
+	) {
+		// Remove body and html from it's current place
+		elmStack.splice(bodyIndex, 1);
+		elmStack.splice( elmStack.indexOf(document.documentElement), 1);
+
+		// Put the body background as the lowest element
+		elmStack.push(document.body);
 	}
 
-	var rect = node.getBoundingClientRect();
-	var currentNode = node;
-	var colorStack = [{
-			color: bgColor,
-			node: node
-		}];
-	var parents = getVisualParents(currentNode, rect);
-
-	if (!parents) {
+	// Return all elements BELOW the current element, null if the element is undefined
+	let elmIndex = elmStack.indexOf(elm);
+	if (calculateObscuringAlpha(elmIndex, elmStack) >= 0.99) {
+		// if the total of the elements above our element results in total obscuring, return null
 		return null;
 	}
+	return elmIndex !== -1 ? elmStack : null;
+};
 
-	while (bgColor.alpha !== 1) {
-		parent = parents.shift();
+color.getBackgroundColor = function(elm, bgElms = [], noScroll = false) {
+	if(noScroll !== true) {
+		elm.scrollIntoView();
+	}
 
-		if (!parent && currentNode.tagName !== 'HTML') {
-			return null;
+	let bgColors = [];
+	let elmStack = color.getBackgroundStack(elm);
+
+	// Search the stack until we have an alpha === 1 background
+	(elmStack || []).some((bgElm) => {
+		let bgElmStyle = window.getComputedStyle(bgElm);
+		
+		// Get the background color
+		let bgColor = getBgColor(bgElm, bgElmStyle);
+
+		if (// abort if a node is outside it's parent and its parent has a background
+			(elm !== bgElm && !dom.visuallyContains(elm, bgElm) && bgColor.alpha !== 0) ||
+			// OR if the background elm is a graphic
+			elmHasImage(bgElm, bgElmStyle)
+		) {
+			bgColors = null;
+			bgElms.push(bgElm);
+
+			return true;
+		}
 
-		//Assume white if top level is not specified
-		} else if (!parent && currentNode.tagName === 'HTML') {
-			parentColor = new color.Color(255, 255, 255, 1);
+		if (bgColor.alpha !== 0) {
+			// store elements contributing to the br color.
+			bgElms.push(bgElm);
+			bgColors.push(bgColor);
 
+			// Exit if the background is opaque
+			return (bgColor.alpha === 1);
 		} else {
-
-			if (!dom.visuallyContains(node, parent)) {
-				return null;
-			}
-
-			parentColor = getBackgroundForSingleNode(parent);
-			if (bgNodes && (parentColor === null || parentColor.alpha !== 0)) {
-				bgNodes.push(parent);
-			}
-			if (parentColor === null) {
-				return null;
-			}
+			return false;
 		}
-		currentNode = parent;
-		bgColor = parentColor;
-		colorStack.push({
-			color: bgColor,
-			node: currentNode
-		});
-	}
-
-	var currColorNode = colorStack.pop();
-	var flattenedColor = currColorNode.color;
+	});
 
-	while ((currColorNode = colorStack.pop()) !== undefined) {
-		flattenedColor = color.flattenColors(currColorNode.color, flattenedColor);
+	if (bgColors !== null && elmStack !== null) {
+		// Mix the colors together, on top of a default white
+		bgColors.push( new color.Color(255, 255, 255, 1));
+		return bgColors.reduce( color.flattenColors);
 	}
 
-	return flattenedColor;
+	return null;
+};
+
+/**
+ * Determines whether an element has a fully opaque background, whether solid color or an image
+ * @param {Element} node
+ * @return {Boolean} false if the background is transparent, true otherwise
+ */
+dom.isOpaque = function(node) {
+	let style = window.getComputedStyle(node);
+	return elmHasImage(node, style) || getBgColor(node, style).alpha === 1;
 };
diff --git a/lib/commons/dom/elements-below-floating.js b/lib/commons/dom/elements-below-floating.js
new file mode 100644
index 0000000000..8a20481504
--- /dev/null
+++ b/lib/commons/dom/elements-below-floating.js
@@ -0,0 +1,37 @@
+/* global dom */
+
+/**
+ * Reduce an array of elements to only those that are below a 'floating' element.
+ *
+ * @param {Array} elements
+ * @param {Element} targetNode
+ * @returns {Array}
+ */
+dom.reduceToElementsBelowFloating = function (elements, targetNode) {
+	var floatingPositions = ['fixed', 'sticky'],
+		finalElements = [],
+		targetFound = false,
+		index,
+		currentNode,
+		style;
+
+	// Filter out elements that are temporarily floating above the target
+	for (index = 0; index < elements.length; ++index) {
+		currentNode = elements[index];
+		if (currentNode === targetNode) {
+			targetFound = true;
+		}
+
+		style = window.getComputedStyle(currentNode);
+
+		if (!targetFound && floatingPositions.indexOf(style.position) !== -1) {
+			//Target was not found yet, so it must be under this floating thing (and will not always be under it)
+			finalElements = [];
+			continue;
+		}
+
+		finalElements.push(currentNode);
+	}
+
+	return finalElements;
+};
diff --git a/lib/commons/dom/elements-from-point.js b/lib/commons/dom/elements-from-point.js
deleted file mode 100644
index 941077bb06..0000000000
--- a/lib/commons/dom/elements-from-point.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* global dom */
-
-/**
- * Returns true if the browser supports one of the methods to get elements from point
- * @param {Document} doc The HTML document
- * @return {Boolean}
- */
-dom.supportsElementsFromPoint = function (doc) {
-	var element = doc.createElement('x');
-	element.style.cssText = 'pointer-events:auto';
-	return element.style.pointerEvents === 'auto' || !!doc.msElementsFromPoint;
-};
-
-
-/**
- * Returns the elements at a particular point in the viewport, in z-index order
- * @param {Document} doc The HTML document
- * @param {Element} x The x coordinate, as an integer
- * @param {Element} y The y coordinate, as an integer
- * @param {Element} targetNode An element that you are targeting. Used to detect if the element is temporarily obscured by another element
- * @return {Array} Array of Elements
- */
-dom.elementsFromPoint = function (doc, x, y, targetNode) {
-	var elements = [],
-		previousPointerEvents = [],
-		current,
-		i,
-		d;
-
-	targetNode = targetNode || false;
-
-	if (doc.msElementsFromPoint) {
-		var nl = doc.msElementsFromPoint(x, y);
-		return nl ? Array.prototype.slice.call(nl) : null;
-	}
-
-	// get all elements via elementFromPoint, and remove them from hit-testing in order
-	while ((current = doc.elementFromPoint(x, y)) && elements.indexOf(current) === -1 && current !== null) {
-		
-		// push the element and its current style
-		elements.push(current);
-
-		previousPointerEvents.push({
-			value: current.style.getPropertyValue('pointer-events'),
-			priority: current.style.getPropertyPriority('pointer-events')
-		});
-
-		// add "pointer-events: none", to get to the underlying element
-		current.style.setProperty('pointer-events', 'none', 'important');
-	}
-
-	// restore the previous pointer-events values
-	for (i = previousPointerEvents.length; !!(d = previousPointerEvents[--i]);) {
-		elements[i].style.setProperty('pointer-events', d.value ? d.value : '', d.priority);
-	}
-
-	elements = dom.reduceToElementsBelowFloating(elements, targetNode);
-
-	// return our results
-	return dom.reduceToFirstOpaque(elements);
-};
-
-/**
- * Reduce an array of elements to only those that are below a 'floating' element.
- * 
- * @param {Array} elements
- * @param {Element} targetNode
- * @returns {Array}
- */
-dom.reduceToElementsBelowFloating = function (elements, targetNode) {
-	var floatingPositions = ['fixed', 'sticky'],
-		finalElements = [],
-		targetFound = false,
-		index,
-		currentNode,
-		style;
-	
-	// Filter out elements that are temporarily floating above the target
-	for (index = 0; index < elements.length; ++index) {
-		currentNode = elements[index];
-		if (currentNode === targetNode) {
-			targetFound = true;
-		}
-
-		style = window.getComputedStyle(currentNode);
-
-		if (!targetFound && floatingPositions.indexOf(style.position) !== -1) {
-			//Target was not found yet, so it must be under this floating thing (and will not always be under it)
-			finalElements = [];
-			continue;
-		}
-
-		finalElements.push(currentNode);
-	}
-	
-	return finalElements;
-};
-
-/**
- * Reduce an array of elements to only those before the first opaque
- * 
- * @param {Array} elements array of elements to reduce
- * @returns {Array}
- */
-dom.reduceToFirstOpaque = function (elements) {
-	var finalElements = [],
-		currentNode,
-		index;
-	
-	for (index = 0; index < elements.length; ++index) {
-		currentNode = elements[index];
-
-		finalElements.push(currentNode);
-
-		if (dom.isOpaque(currentNode)) {
-			break;
-		}
-	}
-	
-	return finalElements;
-};
diff --git a/lib/commons/table/get-all-cells.js b/lib/commons/table/get-all-cells.js
new file mode 100644
index 0000000000..267c2798b8
--- /dev/null
+++ b/lib/commons/table/get-all-cells.js
@@ -0,0 +1,11 @@
+/* global table */
+table.getAllCells = function (tableElm) {
+	var rowIndex, cellIndex, rowLength, cellLength;
+	var cells = [];
+	for (rowIndex = 0, rowLength = tableElm.rows.length; rowIndex < rowLength; rowIndex++) {
+		for (cellIndex = 0, cellLength = tableElm.rows[rowIndex].cells.length; cellIndex < cellLength; cellIndex++) {
+			cells.push(tableElm.rows[rowIndex].cells[cellIndex]);
+		}
+	}
+	return cells;
+};
\ No newline at end of file
diff --git a/lib/commons/table/get-cell-position.js b/lib/commons/table/get-cell-position.js
index bdb898aa05..d587b07cca 100644
--- a/lib/commons/table/get-cell-position.js
+++ b/lib/commons/table/get-cell-position.js
@@ -5,14 +5,15 @@
  * @param  {HTMLTableCelLElement} cell The table cell of which to get the position
  * @return {Object}      Object with `x` and `y` properties of the coordinates
  */
-table.getCellPosition = function (cell) {
-
-	var tbl = table.toArray(dom.findUp(cell, 'table')),
-		index;
+table.getCellPosition = function (cell, tableGrid) {
+	var rowIndex, index;
+	if (!tableGrid) {
+		tableGrid = table.toGrid(dom.findUp(cell, 'table'));
+	}
 
-	for (var rowIndex = 0; rowIndex < tbl.length; rowIndex++) {
-		if (tbl[rowIndex]) {
-			index = tbl[rowIndex].indexOf(cell);
+	for (rowIndex = 0; rowIndex < tableGrid.length; rowIndex++) {
+		if (tableGrid[rowIndex]) {
+			index = tableGrid[rowIndex].indexOf(cell);
 			if (index !== -1) {
 				return {
 					x: index,
diff --git a/lib/commons/table/get-headers.js b/lib/commons/table/get-headers.js
index 6ae71d83e9..b9b19b5aff 100644
--- a/lib/commons/table/get-headers.js
+++ b/lib/commons/table/get-headers.js
@@ -11,27 +11,17 @@ table.getHeaders = function (cell) {
 		return commons.dom.idrefs(cell, 'headers');
 	}
 
-	var headers = [], currentCell,
-		tbl = commons.table.toArray(commons.dom.findUp(cell, 'table')),
-		position = commons.table.getCellPosition(cell);
+	var tableGrid = commons.table.toGrid(commons.dom.findUp(cell, 'table'));
+	var position = commons.table.getCellPosition(cell, tableGrid);
 
-	//
-	for (var x = position.x - 1; x >= 0; x--) {
-		currentCell = tbl[position.y][x];
+	// TODO: RTL text
+	var rowHeaders = table
+	.traverse('left', position, tableGrid)
+	.filter((cell) => table.isRowHeader(cell));
 
-		if (commons.table.isRowHeader(currentCell)) {
-			headers.unshift(currentCell);
-		}
-	}
-
-	for (var y = position.y - 1; y >= 0; y--) {
-		currentCell = tbl[y][position.x];
-
-		if (currentCell && commons.table.isColumnHeader(currentCell)) {
-			headers.unshift(currentCell);
-		}
-	}
-
-	return headers;
+	var colHeaders = table
+	.traverse('up', position, tableGrid)
+	.filter((cell) => table.isColumnHeader(cell));
 
+	return [].concat(rowHeaders, colHeaders).reverse();
 };
\ No newline at end of file
diff --git a/lib/commons/table/get-scope.js b/lib/commons/table/get-scope.js
new file mode 100644
index 0000000000..0d2ce03dff
--- /dev/null
+++ b/lib/commons/table/get-scope.js
@@ -0,0 +1,52 @@
+/*global table, dom */
+
+/**
+ * Determine if a `HTMLTableCellElement` is a column header
+ * @param  {HTMLTableCellElement}  node The table cell to test
+ * @return {Boolean}
+ */
+table.getScope = function (cell) {
+	var scope = cell.getAttribute('scope');
+	var role = cell.getAttribute('role');
+
+	if (cell instanceof Element === false ||
+		['TD', 'TH'].indexOf(cell.nodeName.toUpperCase()) === -1
+	) {
+		throw new TypeError('Expected TD or TH element');
+	}
+
+	if (role === 'columnheader') {
+		return 'col';
+
+	} else if (role === 'rowheader') {
+		return 'row';
+
+	} else if (scope === 'col' || scope === 'row') {
+		return scope;
+
+	} else if (cell.nodeName.toUpperCase() !== 'TH') {
+		return false;
+	}
+	var tableGrid = table.toGrid(dom.findUp(cell, 'table'));
+	var pos = table.getCellPosition(cell);
+
+	// The element is in a row with all th elements, that makes it a column header
+	var headerRow = tableGrid[pos.y].reduce((headerRow, cell) => {
+		return headerRow && cell.nodeName.toUpperCase() === 'TH';
+	}, true);
+
+	if (headerRow) {
+		return 'col';
+	}
+
+	// The element is in a column with all th elements, that makes it a row header
+	var headerCol = tableGrid.map((col) => col[pos.x])
+	.reduce((headerCol, cell) => {
+		return headerCol && cell.nodeName.toUpperCase() === 'TH';
+	}, true);
+
+	if (headerCol) {
+		return 'row';
+	}
+	return 'auto';
+};
\ No newline at end of file
diff --git a/lib/commons/table/is-column-header.js b/lib/commons/table/is-column-header.js
index c6166c2c23..83386f1741 100644
--- a/lib/commons/table/is-column-header.js
+++ b/lib/commons/table/is-column-header.js
@@ -1,4 +1,4 @@
-/*global table, dom */
+/*global table */
 
 /**
  * Determine if a `HTMLTableCellElement` is a column header
@@ -6,28 +6,5 @@
  * @return {Boolean}
  */
 table.isColumnHeader = function (node) {
-
-	var scope = node.getAttribute('scope');
-	if (scope === 'col' || node.getAttribute('role') === 'columnheader') {
-		return true;
-	} else if (scope || node.nodeName.toUpperCase() !== 'TH') {
-		return false;
-	}
-
-	var currentCell,
-		position = table.getCellPosition(node),
-		tbl = table.toArray(dom.findUp(node, 'table')),
-		cells = tbl[position.y];
-
-	for (var cellIndex = 0, cellLength = cells.length; cellIndex < cellLength; cellIndex++) {
-		currentCell = cells[cellIndex];
-		if (currentCell !== node) {
-			if (table.isDataCell(currentCell)) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-
+	return (['col', 'auto'].indexOf(table.getScope(node)) !== -1);
 };
\ No newline at end of file
diff --git a/lib/commons/table/is-row-header.js b/lib/commons/table/is-row-header.js
index 785b36ce30..8516a547db 100644
--- a/lib/commons/table/is-row-header.js
+++ b/lib/commons/table/is-row-header.js
@@ -1,4 +1,4 @@
-/*global table, dom */
+/*global table */
 
 /**
  * Determine if a `HTMLTableCellElement` is a row header
@@ -6,31 +6,5 @@
  * @return {Boolean}
  */
 table.isRowHeader = function (node) {
-
-	var scope = node.getAttribute('scope');
-	if (scope === 'row' || node.getAttribute('role') === 'rowheader') {
-		return true;
-	} else if (scope || node.nodeName.toUpperCase() !== 'TH') {
-		return false;
-	}
-
-	if (table.isColumnHeader(node)) {
-		return false;
-	}
-
-	var currentCell,
-		position = table.getCellPosition(node),
-		tbl = table.toArray(dom.findUp(node, 'table'));
-
-	for (var rowIndex = 0, rowLength = tbl.length; rowIndex < rowLength; rowIndex++) {
-		currentCell = tbl[rowIndex][position.x];
-		if (currentCell !== node) {
-			if (table.isDataCell(currentCell)) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-
+	return (['row', 'auto'].indexOf(table.getScope(node)) !== -1);
 };
\ No newline at end of file
diff --git a/lib/commons/table/to-array.js b/lib/commons/table/to-grid.js
similarity index 81%
rename from lib/commons/table/to-array.js
rename to lib/commons/table/to-grid.js
index 63805d9330..565d203212 100644
--- a/lib/commons/table/to-array.js
+++ b/lib/commons/table/to-grid.js
@@ -1,11 +1,11 @@
 /*global table */
 
 /**
- * Converts a table to an Array, normalized for row and column spans
+ * Converts a table to an Array of arrays, normalized for row and column spans
  * @param  {HTMLTableElement} node The table to convert
  * @return {Array}      Array of rows and cells
  */
-table.toArray = function (node) {
+table.toGrid = function (node) {
 	var table = [];
 	var rows = node.rows;
 	for (var i = 0, rowLength = rows.length; i < rowLength; i++) {
@@ -30,3 +30,6 @@ table.toArray = function (node) {
 
 	return table;
 };
+
+// This was the old name
+table.toArray = table.toGrid;
\ No newline at end of file
diff --git a/lib/commons/table/traverse.js b/lib/commons/table/traverse.js
new file mode 100644
index 0000000000..18d9d6b002
--- /dev/null
+++ b/lib/commons/table/traverse.js
@@ -0,0 +1,59 @@
+/* global table */
+(function (table) {
+
+	var traverseTable = function (dir, position, tableGrid, callback) {
+		var result;
+		var cell = (tableGrid[position.y] ? tableGrid[position.y][position.x] : undefined);
+		if (!cell) {
+			return [];
+		}
+		if (typeof callback === 'function') {
+			result = callback(cell, position, tableGrid);
+			if (result === true) { // abort
+				return [cell];
+			}
+		}
+
+		result = traverseTable(dir, {
+			x: position.x + dir.x,
+			y: position.y + dir.y
+		}, tableGrid, callback);
+		result.unshift(cell);
+		return result;
+	};
+
+	/**
+	 * Traverses a table in a given direction, passing it to the callback
+	 * @param  {object}   dir      Direction that will be added recursively {x: 1, y: 0};
+	 * @param  {object}   start    x/y coordinate: {x: 0, y: 0};
+	 * @param  {array}    [table]  A matrix of the table obtained using axe.commons.table.toArray (OPTIONAL)
+	 * @param  {Function} callback Function to which each cell will be passed
+	 * @return {nodeElemtn}        If the callback returns true, the traversal will end and the cell will be returned
+	 */
+	table.traverse = function (dir, startPos, tableGrid, callback) {
+		if (Array.isArray(startPos)) {
+			callback = tableGrid;
+			tableGrid = startPos;
+			startPos = { x:0, y:0 };
+		}
+
+		if (typeof dir === 'string') {
+			switch (dir) {
+				case 'left': dir = { x: -1, y: 0 };
+					break;
+				case 'up': dir = { x: 0, y: -1 };
+					break;
+				case 'right': dir = { x: 1, y: 0 };
+					break;
+				case 'down': dir = { x: 0, y: 1 };
+					break;
+			}
+		}
+
+		return traverseTable(dir, {
+			x: startPos.x + dir.x,
+			y: startPos.y + dir.y
+		}, tableGrid, callback);
+	};
+
+}(table));
\ No newline at end of file
diff --git a/lib/core/base/audit.js b/lib/core/base/audit.js
index 816cf653c9..1609f281b1 100644
--- a/lib/core/base/audit.js
+++ b/lib/core/base/audit.js
@@ -1,15 +1,25 @@
-/*global Rule, Check, commons: true */
+/*global Rule, Check, RuleResult, commons: true */
 
-function setDefaultConfiguration(audit) {
+function getDefaultConfiguration(audit) {
 	'use strict';
+	var config;
+	if (audit) {
+		config = axe.utils.clone(audit);
+		// Commons are configured into axe like everything else,
+		// however because things go funky if we have multiple commons objects
+		// we're not using the copy of that.
+		config.commons = audit.commons;
+	} else {
+		config = {};
+	}
 
-	var config = audit || {};
+	config.reporter = config.reporter || null;
 	config.rules = config.rules || [];
 	config.checks = config.checks || [];
-	config.data = config.data || {
+	config.data = Object.assign({
 		checks: {},
 		rules: {}
-	};
+	}, config.data);
 
 	return config;
 }
@@ -27,11 +37,11 @@ function unpackToObject(collection, audit, method) {
  * Constructor which holds configured rules and information about the document under test
  */
 function Audit(audit) {
-	/*jshint maxstatements:16 */
-	'use strict';
 	// defaults
 	this.brand = 'axe';
 	this.application = 'axeAPI';
+	this.tagExclude = ['experimental'];
+
 	this.defaultConfig = audit;
 	this._init();
 }
@@ -40,8 +50,7 @@ function Audit(audit) {
  * Initializes the rules and checks
  */
 Audit.prototype._init = function () {
-	'use strict';
-	var audit = setDefaultConfiguration(this.defaultConfig);
+	var audit = getDefaultConfiguration(this.defaultConfig);
 
 	axe.commons = commons = audit.commons;
 
@@ -52,12 +61,13 @@ Audit.prototype._init = function () {
 
 	unpackToObject(audit.rules, this, 'addRule');
 	unpackToObject(audit.checks, this, 'addCheck');
+
 	this.data = {};
 	this.data.checks = (audit.data && audit.data.checks) || {};
 	this.data.rules = (audit.data && audit.data.rules) || {};
 	this.data.failureSummaries = (audit.data && audit.data.failureSummaries) || {};
-	this._constructHelpUrls(); // create default helpUrls
 
+	this._constructHelpUrls(); // create default helpUrls
 };
 
 /**
@@ -80,16 +90,12 @@ Audit.prototype.addRule = function (spec) {
 		this.data.rules[spec.id] = spec.metadata;
 	}
 
-	var candidate;
-	for (var i = 0, l = this.rules.length; i < l; i++) {
-		candidate = this.rules[i];
-		if (candidate.id === spec.id) {
-			candidate.configure(spec);
-			return;
-		}
+	let rule = this.getRule(spec.id);
+	if (rule) {
+		rule.configure(spec);
+	} else {
+		this.rules.push(new Rule(spec, this));
 	}
-
-	this.rules.push(new Rule(spec, this));
 };
 
 /**
@@ -99,10 +105,24 @@ Audit.prototype.addRule = function (spec) {
  * @param {Object} spec Check specification object
  */
 Audit.prototype.addCheck = function (spec) {
+	/*jshint evil:true */
 	'use strict';
-
-	if (spec.metadata) {
-		this.data.checks[spec.id] = spec.metadata;
+	let metadata = spec.metadata;
+
+	if (typeof metadata === 'object') {
+		this.data.checks[spec.id] = metadata;
+		// Transform messages into functions:
+		if (typeof metadata.messages === 'object') {
+			Object.keys(metadata.messages)
+			.filter( prop =>
+				metadata.messages.hasOwnProperty(prop) &&
+				typeof metadata.messages[prop] === 'string'
+			).forEach( prop => {
+				if (metadata.messages[prop].indexOf('function') === 0) {
+					metadata.messages[prop] = (new Function('return ' + metadata.messages[prop] + ';'))();
+				}
+			});
+		}
 	}
 
 	if (this.checks[spec.id]) {
@@ -121,6 +141,7 @@ Audit.prototype.addCheck = function (spec) {
  */
 Audit.prototype.run = function (context, options, resolve, reject) {
 	'use strict';
+	this.validateOptions(options);
 
 	var q = axe.utils.queue();
 	this.rules.forEach(function (rule) {
@@ -128,8 +149,15 @@ Audit.prototype.run = function (context, options, resolve, reject) {
 			q.defer(function (res, rej) {
 				rule.run(context, options, res, function (err) {
 					if (!options.debug) {
-						axe.log(err);
-						res(null);
+						var errResult = Object.assign(new RuleResult(rule), {
+							result: axe.constants.CANTTELL,
+							description: 'An error occured while running this rule',
+							message: err.message,
+							help: err.stack || err.message,
+							error: err
+						});
+						res(errResult);
+
 					} else {
 						rej(err);
 					}
@@ -160,6 +188,72 @@ Audit.prototype.after = function (results, options) {
 };
 
 /**
+ * Get the rule with a given ID
+ * @param  {string}
+ * @return {Rule}
+ */
+Audit.prototype.getRule = function (ruleId) {
+	return this.rules.find(rule => rule.id === ruleId);
+};
+
+/**
+ * Ensure all rules that are expected to run exist
+ * @throws {Error} If any tag or rule specified in options is unknown
+ * @param  {Object} options  Options object
+ * @return {Object}          Validated options object
+ */
+Audit.prototype.validateOptions = function (options) {
+	'use strict';
+	var audit = this;
+
+	// Validate runOnly
+	if (typeof options.runOnly === 'object') {
+		var only = options.runOnly;
+
+		// Check if every value in options.runOnly is a known rule ID
+		if (only.type === 'rule' && Array.isArray(only.value)) {
+			only.value.forEach(function (ruleId) {
+				if (!audit.getRule(ruleId)) {
+					throw new Error('unknown rule `' + ruleId +  '` in options.runOnly');
+				}
+			});
+
+		// Validate 'tags' (e.g. anything not 'rule')
+		} else if (Array.isArray(only.value) && only.value.length > 0) {
+			var tags = [].concat(only.value);
+
+			audit.rules.forEach(function (rule) {
+				var tagPos, i, l;
+				if (!tags) {
+					return;
+				}
+				// Remove any known tag
+				for (i = 0, l = rule.tags.length; i < l; i++) {
+					tagPos = tags.indexOf(rule.tags[i]);
+					if (tagPos !== -1) {
+						tags.splice(tagPos, 1);
+					}
+				}
+			});
+			if (tags.length !== 0) {
+				throw new Error('could not find tags `' + tags.join('`, `') + '`');
+			}
+		}
+	}
+
+	if (typeof options.rules === 'object') {
+		Object.keys(options.rules)
+		.forEach(function (ruleId) {
+			if (!audit.getRule(ruleId)) {
+				throw new Error('unknown rule `' + ruleId +  '` in options.rules');
+			}
+		});
+	}
+
+	return options;
+};
+
+/*
  * Updates the default options and then applies them
  * @param  {Mixed} options  Options object
  */
@@ -182,16 +276,15 @@ Audit.prototype.setBranding = function (branding) {
  */
 
 Audit.prototype._constructHelpUrls = function () {
-	'use strict';
-	var that = this;
 	var version = axe.version.substring(0, axe.version.lastIndexOf('.'));
-	this.rules.forEach(function (rule) {
-		that.data.rules[rule.id] = that.data.rules[rule.id] || {};
-		that.data.rules[rule.id].helpUrl = 'https://dequeuniversity.com/rules/' +
-			that.brand + '/' +
+
+	this.rules.forEach(rule => {
+		this.data.rules[rule.id] = this.data.rules[rule.id] || {};
+		this.data.rules[rule.id].helpUrl = 'https://dequeuniversity.com/rules/' +
+			this.brand + '/' +
 			version + '/' +
 			rule.id + '?' +
-			'application=' + that.application;
+			'application=' + this.application;
 	});
 };
 
@@ -203,4 +296,4 @@ Audit.prototype._constructHelpUrls = function () {
  Audit.prototype.resetRulesAndChecks = function () {
 	'use strict';
  	this._init();
- };
\ No newline at end of file
+ };
diff --git a/lib/core/base/check.js b/lib/core/base/check.js
index e304902369..9e94adcdf0 100644
--- a/lib/core/base/check.js
+++ b/lib/core/base/check.js
@@ -10,73 +10,46 @@ function createExecutionContext(spec) {
 }
 
 function Check(spec) {
-	'use strict';
-
-	/**
-	 * Unique ID for the check.  Checks may be re-used, so there may be additional instances of checks
-	 * with the same ID.
-	 * @type {String}
-	 */
-	this.id = spec.id;
-
-	/**
-	 * Free-form options that are passed as the second parameter to the `evaluate`
-	 * @type {Mixed}
-	 */
-	this.options = spec.options;
-
-	/**
-	 * Optional. If specified, only nodes that match this CSS selector are tested
-	 * @type {String}
-	 */
-	this.selector = spec.selector;
-
-	/**
-	 * The actual code, accepts 2 parameters: node (the node under test), options (see this.options).
-	 * This function is run in the context of a checkHelper, which has the following methods
-	 * - `async()` - if called, the check is considered to be asynchronous; returns a callback function
-	 * - `data()` - free-form data object, associated to the `CheckResult` which is specific to each node
-	 * @type {Function}
-	 */
-	this.evaluate = createExecutionContext(spec.evaluate);
-
-	/**
-	 * Optional. Filter and/or modify checks for all nodes
-	 * @type {Function}
-	 */
-	if (spec.after) {
-		this.after = createExecutionContext(spec.after);
+	if (spec) {
+		this.id = spec.id;
+		this.configure(spec);
 	}
+}
 
-	if (spec.matches) {
-		/**
-		 * Optional function to test if check should be run against a node, overrides Check#matches
-		 * @type {Function}
-		 */
-		this.matches = createExecutionContext(spec.matches);
-	}
+/**
+ * Unique ID for the check.  Checks may be re-used, so there may be additional instances of checks
+ * with the same ID.
+ * @type {String}
+ */
+// Check.prototype.id;
 
-	/**
-	 * enabled by default, if false, this check will not be included in the rule's evaluation
-	 * @type {Boolean}
-	 */
-	this.enabled = spec.hasOwnProperty('enabled') ? spec.enabled : true;
-}
+/**
+ * Free-form options that are passed as the second parameter to the `evaluate`
+ * @type {Mixed}
+ */
+// Check.prototype.options;
 
 /**
- * Determines whether the check should be run against a node
- * @param  {HTMLElement} node The node to test
- * @return {Boolean}      Whether the check should be run
+ * The actual code, accepts 2 parameters: node (the node under test), options (see this.options).
+ * This function is run in the context of a checkHelper, which has the following methods
+ * - `async()` - if called, the check is considered to be asynchronous; returns a callback function
+ * - `data()` - free-form data object, associated to the `CheckResult` which is specific to each node
+ * @type {Function}
  */
-Check.prototype.matches = function (node) {
-	'use strict';
+// Check.prototype.evaluate;
 
-	if (!this.selector || axe.utils.matchesSelector(node, this.selector)) {
-		return true;
-	}
+/**
+ * Optional. Filter and/or modify checks for all nodes
+ * @type {Function}
+ */
+// Check.prototype.after;
+
+/**
+ * enabled by default, if false, this check will not be included in the rule's evaluation
+ * @type {Boolean}
+ */
+Check.prototype.enabled = true;
 
-	return false;
-};
 
 /**
  * Run the check's evaluate function (call `this.evaluate(node, options)`)
@@ -91,7 +64,7 @@ Check.prototype.run = function (node, options, resolve, reject) {
 	var enabled = options.hasOwnProperty('enabled') ? options.enabled : this.enabled,
 		checkOptions = options.options || this.options;
 
-	if (enabled && this.matches(node)) {
+	if (enabled) {
 		var checkResult = new CheckResult(this);
 		var checkHelper = axe.utils.checkHelper(checkResult, resolve, reject);
 		var result;
@@ -122,45 +95,11 @@ Check.prototype.run = function (node, options, resolve, reject) {
  */
 
 Check.prototype.configure = function (spec) {
-	/*jshint maxstatements:18 */
-	/*jshint evil:true */
-	'use strict';
-
-	if (spec.hasOwnProperty('options')) {
-		this.options = spec.options;
-	}
-
-	if (spec.hasOwnProperty('selector')) {
-		this.selector = spec.selector;
-	}
-
-	if (spec.hasOwnProperty('evaluate')) {
-		if (typeof spec.evaluate === 'string') {
-			this.evaluate = new Function('return ' + spec.evaluate + ';')();
-		} else {
-			this.evaluate = spec.evaluate;
-		}
-	}
-
-	if (spec.hasOwnProperty('after')) {
-		if (typeof spec.after === 'string') {
-			this.after = new Function('return ' + spec.after + ';')();
-		} else {
-			this.after = spec.after;
-		}
-	}
-
-	if (spec.hasOwnProperty('matches')) {
-		if (typeof spec.matches === 'string') {
-			this.matches = new Function('return ' + spec.matches + ';')();
-		} else {
-			this.matches = spec.matches;
-		}
-	}
-
-	if (spec.hasOwnProperty('enabled')) {
-		this.enabled = spec.enabled;
-	}
+	['options', 'enabled']
+	.filter( prop => spec.hasOwnProperty(prop) )
+	.forEach( prop => this[prop] = spec[prop] );
 
+	['evaluate', 'after']
+	.filter( prop => spec.hasOwnProperty(prop) )
+	.forEach( prop => this[prop] = createExecutionContext(spec[prop]) );
 };
-
diff --git a/lib/core/base/context.js b/lib/core/base/context.js
index 9967247160..bbe9333388 100644
--- a/lib/core/base/context.js
+++ b/lib/core/base/context.js
@@ -27,7 +27,7 @@ function pushUniqueFrame(collection, frame) {
 /**
  * Unshift selectors of matching iframes
  * @private
- * @param  {Context} context The context object to operate on and assign to
+ * @param  {Context} context 	  The context object to operate on and assign to
  * @param  {String} type          The "type" of context, 'include' or 'exclude'
  * @param  {Array} selectorArray  Array of CSS selectors, each element represents a frame;
  * where the last element is the actual node
@@ -146,6 +146,30 @@ function parseSelectorArray(context, type) {
 	});
 }
 
+
+/**
+ * Check that the context, as well as each frame includes at least 1 element
+ * @private
+ * @param  {context} context
+ * @return {Error}
+ */
+function validateContext(context) {
+	'use strict';
+
+	if (context.include.length === 0) {
+		if (context.frames.length === 0) {
+			var env = axe.utils.respondable.isInFrame() ? 'frame' : 'page';
+			return new Error('No elements found for include in ' + env + ' Context');
+		}
+		context.frames.forEach(function (frame, i) {
+			if (frame.include.length === 0) {
+				return new Error('No elements found for include in Context of frame ' + i);
+			}
+		});
+	}
+}
+
+
 /**
  * Holds context of includes, excludes and frames for analysis.
  *
@@ -191,4 +215,9 @@ function Context(spec) {
 		this.page = true;
 	}
 
+	// Validate outside of a frame
+	var err = validateContext(this);
+	if (err instanceof Error) {
+		throw err;
+	}
 }
diff --git a/lib/core/base/rule-result.js b/lib/core/base/rule-result.js
index 06ca24e351..03103b3e29 100644
--- a/lib/core/base/rule-result.js
+++ b/lib/core/base/rule-result.js
@@ -17,7 +17,7 @@ function RuleResult(rule) {
 	 * The calculated result of the Rule, either PASS, FAIL or NA
 	 * @type {String}
 	 */
-	this.result = axe.constants.result.NA;
+	this.result = axe.constants.NA;
 
 	/**
 	 * Whether the Rule is a "pageLevel" rule
diff --git a/lib/core/constants.js b/lib/core/constants.js
index f175ad6a6b..c9bd00e187 100644
--- a/lib/core/constants.js
+++ b/lib/core/constants.js
@@ -1,12 +1,63 @@
+(function (axe) {
 
-axe.constants = {};
+var definitions = [{
+	name: 'NA',
+	value: 'inapplicable',
+	priority: 0,
+	group: 'inapplicable'
+}, {
+	name: 'PASS',
+	value: 'passed',
+	priority: 1,
+	group: 'passes'
+}, {
+	name: 'CANTTELL',
+	value: 'cantTell',
+	priority: 2,
+	group: 'incomplete'
+}, {
+	name: 'FAIL',
+	value: 'failed',
+	priority: 3,
+	group: 'violations'
+}];
 
-axe.constants.result = {
-	PASS: 'PASS',
-	FAIL: 'FAIL',
-	NA: 'NA'
+var constants = {
+	results: [],
+	resultGroups: [],
+	resultGroupMap: {},
+	impact: Object.freeze(['minor', 'moderate', 'serious', 'critical'])
 };
 
-axe.constants.raisedMetadata = {
-	impact: ['minor', 'moderate', 'serious', 'critical']
-};
+
+definitions.forEach(function (definition) {
+	var name = definition.name;
+	var value = definition.value;
+	var priority = definition.priority;
+	var group = definition.group;
+
+	constants[name] = value;
+	constants[name + '_PRIO'] = priority;
+	constants[name + '_GROUP'] = group;
+
+	constants.results[priority] = value;
+	constants.resultGroups[priority] = group;
+
+	constants.resultGroupMap[value] = group;
+});
+
+// Freeze everything
+Object.freeze(constants.results);
+Object.freeze(constants.resultGroups);
+Object.freeze(constants.resultGroupMap);
+Object.freeze(constants);
+
+// Ensure that constants can not be changed
+Object.defineProperty(axe, 'constants', {
+	value: constants,
+	enumerable: true,
+	configurable: false,
+	writable: false
+});
+
+}(axe));
\ No newline at end of file
diff --git a/lib/core/public/a11y-check.js b/lib/core/public/a11y-check.js
new file mode 100644
index 0000000000..97a98ed1df
--- /dev/null
+++ b/lib/core/public/a11y-check.js
@@ -0,0 +1,33 @@
+/**
+ * Starts analysis on the current document and its subframes
+ * 
+ * @param  {Object}   context  The `Context` specification object @see Context
+ * @param  {Array}    options  Optional RuleOptions
+ * @param  {Function} callback The function to invoke when analysis is complete; receives an array of `RuleResult`s
+ */
+axe.a11yCheck = function (context, options, callback) {
+	'use strict';
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
+
+	if (!options || typeof options !== 'object') {
+		options = {};
+	}
+
+	var audit = axe._audit;
+	if (!audit) {
+		throw new Error('No audit configured');
+	}
+	options.reporter = options.reporter || audit.reporter || 'v2';
+
+	var reporter = axe.getReporter(options.reporter);
+	axe._runRules(context, options, function (results) {
+		var res = reporter(results, options, callback);
+		if (res !== undefined) {
+			callback(res);
+		}
+	}, axe.log);
+};
+
diff --git a/lib/core/public/configure.js b/lib/core/public/configure.js
index 1c526fc5f1..34b81fa7cf 100644
--- a/lib/core/public/configure.js
+++ b/lib/core/public/configure.js
@@ -1,5 +1,4 @@
-/*global reporters */
-
+/* global reporters */
 function configureChecksRulesAndBranding(spec) {
 	'use strict';
 	var audit;
@@ -8,7 +7,7 @@ function configureChecksRulesAndBranding(spec) {
 	if (!audit) {
 		throw new Error('No audit configured');
 	}
-	
+
 	if (spec.reporter && (typeof spec.reporter === 'function' || reporters[spec.reporter])) {
 		audit.reporter = spec.reporter;
 	}
@@ -27,6 +26,12 @@ function configureChecksRulesAndBranding(spec) {
 
 	if (typeof spec.branding !== 'undefined') {
 		audit.setBranding(spec.branding);
+	} else {
+		audit._constructHelpUrls();
+	}
+
+	if (spec.tagExclude) {
+		audit.tagExclude = spec.tagExclude;
 	}
 }
 
diff --git a/lib/core/public/load.js b/lib/core/public/load.js
index 82b5156905..d328a9d03c 100644
--- a/lib/core/public/load.js
+++ b/lib/core/public/load.js
@@ -30,7 +30,7 @@ function runCommand(data, keepalive, callback) {
 
 /**
  * Sets up Rules, Messages and default options for Checks, must be invoked before attempting analysis
- * @param  {Object} audit The "audit specifcation" object
+ * @param  {Object} audit The "audit specification" object
  * @private
  */
 axe._load = function(audit) {
diff --git a/lib/core/public/reporter.js b/lib/core/public/reporter.js
index 5d61e60927..bb9d463ca9 100644
--- a/lib/core/public/reporter.js
+++ b/lib/core/public/reporter.js
@@ -1,10 +1,8 @@
-/*exported getReporter */
 var reporters = {};
 var defaultReporter;
 
-function getReporter(reporter) {
+axe.getReporter = function(reporter) {
 	'use strict';
-
 	if (typeof reporter === 'string' && reporters[reporter]) {
 		return reporters[reporter];
 	}
@@ -14,9 +12,9 @@ function getReporter(reporter) {
 	}
 
 	return defaultReporter;
-}
+};
 
-axe.reporter = function registerReporter(name, cb, isDefault) {
+axe.addReporter = function registerReporter(name, cb, isDefault) {
 	'use strict';
 
 	reporters[name] = cb;
diff --git a/lib/core/public/run-rules.js b/lib/core/public/run-rules.js
index 807c7ee513..f983c38e68 100644
--- a/lib/core/public/run-rules.js
+++ b/lib/core/public/run-rules.js
@@ -1,4 +1,4 @@
-/*global Context, getReporter */
+/*global Context */
 /*exported runRules */
 
 /**
@@ -35,33 +35,19 @@ function runRules(context, options, resolve, reject) {
 			// after should only run once, so ensure we are in the top level window
 			if (context.initiator) {
 				results = audit.after(results, options);
+
+				results.forEach(axe.utils.publishMetaData);
 				results = results.map(axe.utils.finalizeRuleResult);
 			}
-			resolve(results);
+			try {
+				resolve(results);
+			} catch(e) {
+				axe.log(e);
+			}
 		} catch (e) {
 			reject(e);
 		}
 	}).catch(reject);
 }
 
-axe.a11yCheck = function (context, options, callback) {
-	'use strict';
-	if (typeof options === 'function') {
-		callback = options;
-		options = {};
-	}
-
-	if (!options || typeof options !== 'object') {
-		options = {};
-	}
-
-	var audit = axe._audit;
-	if (!audit) {
-		throw new Error('No audit configured');
-	}
-	var reporter = getReporter(options.reporter || audit.reporter);
-	runRules(context, options, function (results) {
-		reporter(results, callback);
-	}, axe.log);
-};
-
+axe._runRules = runRules;
diff --git a/lib/core/public/run.js b/lib/core/public/run.js
new file mode 100644
index 0000000000..333c1c2b6e
--- /dev/null
+++ b/lib/core/public/run.js
@@ -0,0 +1,137 @@
+/* global Promise */
+
+function isContext(potential) {
+	'use strict';
+	switch (true) {
+		case (typeof potential === 'string'):
+		case (Array.isArray(potential)):
+		case Node && potential instanceof Node:
+		case NodeList && potential instanceof NodeList:
+			return true;
+
+		case typeof potential !== 'object':
+			return false;
+
+		case potential.include !== undefined:
+		case potential.exclude !== undefined:
+		case typeof potential.length === 'number':
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+var noop = function () {};
+
+
+/**
+ * Normalize the optional params of axe.run()
+ * @param  {object}   context
+ * @param  {object}   options
+ * @param  {Function} callback
+ * @return {object}            With 3 keys: context, options, callback
+ */
+function normalizeRunParams(context, options, callback) {
+	'use strict';
+	let typeErr = new TypeError('axe.run arguments are invalid');
+
+	// Determine the context
+	if (!isContext(context)) {
+		if (callback !== undefined) {
+			// Either context is invalid or there are too many params
+			throw typeErr;
+		}
+		// Set default and shift one over
+		callback = options;
+		options = context;
+		context = document;
+	}
+
+	// Determine the options
+	if (typeof options !== 'object') {
+		if (callback !== undefined) {
+			// Either options is invalid or there are too many params
+			throw typeErr;
+		}
+		// Set default and shift one over
+		callback = options;
+		options = {};
+	}
+
+	// Set the callback or noop;
+	if (typeof callback !== 'function' && callback !== undefined) {
+		throw typeErr;
+	}
+
+	return {
+		context: context,
+		options: options,
+		callback: callback || noop
+	};
+}
+
+
+/**
+ * Runs a number of rules against the provided HTML page and returns the
+ * resulting issue list
+ *
+ * @param  {Object}   context  (optional) Defines the scope of the analysis
+ * @param  {Object}   options  (optional) Set of options passed into rules or checks
+ * @param  {Function} callback (optional) The callback when axe is done, given 2 params:
+ *                             - Error    If any errors occured, otherwise null
+ *                             - Results  The results object / array, or undefined on error
+ * @return {Promise}           Resolves with the axe results. Only available when natively supported
+ */
+axe.run = function (context, options, callback) {
+	'use strict';
+	if (!axe._audit) {
+		throw new Error('No audit configured');
+	}
+
+	let args = normalizeRunParams(context, options, callback);
+	context = args.context;
+	options = args.options;
+	callback = args.callback;
+
+	// set defaults:
+	options.reporter = options.reporter || axe._audit.reporter || 'v1';
+
+	let p;
+	let reject = noop;
+	let resolve = noop;
+
+	if (window.Promise && callback === noop) {
+		p = new Promise(function (_resolve, _reject) {
+			reject = _reject;
+			resolve = _resolve;
+		});
+	}
+
+	axe._runRules(context, options, function (rawResults) {
+		let respond = function (results) {
+			try {
+				callback(null, results);
+			} catch(e) {
+				axe.log(e);
+			}
+			resolve(results);
+		};
+
+		try {
+			let reporter = axe.getReporter(options.reporter);
+			let results = reporter(rawResults, options, respond);
+			if (results !== undefined) {
+				respond(results);
+			}
+		} catch (err) {
+			callback(err);
+			reject(err);
+		}
+	}, function (err) {
+		callback(err);
+		reject(err);
+	});
+
+	return p;
+};
\ No newline at end of file
diff --git a/lib/core/reporters/helpers/failure-summary.js b/lib/core/reporters/helpers/failure-summary.js
index 22e6c7773e..aaea0a6fe6 100644
--- a/lib/core/reporters/helpers/failure-summary.js
+++ b/lib/core/reporters/helpers/failure-summary.js
@@ -17,10 +17,15 @@ helpers.failureSummary = function failureSummary(nodeData) {
 		if (!failingChecks[key].length) {
 			return;
 		}
-		// @todo rm .failureMessage
-		return axe._audit.data.failureSummaries[key].failureMessage(failingChecks[key].map(function (check) {
-			return check.message || '';
-		}));
+
+		var sum = axe._audit.data.failureSummaries[key];
+		if (sum && typeof sum.failureMessage === 'function') {
+			return sum.failureMessage(failingChecks[key]
+			.map(function (check) {
+				return check.message || '';
+			}));
+		}
+
 	}).filter(function (i) {
 		return i !== undefined;
 	}).join('\n\n');
diff --git a/lib/core/reporters/helpers/format-check.js b/lib/core/reporters/helpers/format-check.js
deleted file mode 100644
index 4760729f9b..0000000000
--- a/lib/core/reporters/helpers/format-check.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*global helpers */
-
-helpers.formatCheck = function (check) {
-	'use strict';
-	
-	return {
-		id: check.id,
-		impact: check.impact,
-		message: check.message,
-		data: check.data,
-		relatedNodes: check.relatedNodes.map(helpers.formatNode)
-	};
-};
diff --git a/lib/core/reporters/helpers/format-checks.js b/lib/core/reporters/helpers/format-checks.js
deleted file mode 100644
index 3a4da983f2..0000000000
--- a/lib/core/reporters/helpers/format-checks.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*global helpers */
-helpers.formatChecks = function (nodeResult, data) {
-	'use strict';
-
-	nodeResult.any = data.any.map(helpers.formatCheck);
-	nodeResult.all = data.all.map(helpers.formatCheck);
-	nodeResult.none = data.none.map(helpers.formatCheck);
-	return nodeResult;
-};
diff --git a/lib/core/reporters/helpers/format-node.js b/lib/core/reporters/helpers/format-node.js
deleted file mode 100644
index eb2d26cb46..0000000000
--- a/lib/core/reporters/helpers/format-node.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*global helpers */
-helpers.formatNode = function (node) {
-	'use strict';
-
-	return {
-		target: node ? node.selector : null,
-		html: node ? node.source : null
-	};
-};
diff --git a/lib/core/reporters/helpers/format-rule-result.js b/lib/core/reporters/helpers/format-rule-result.js
deleted file mode 100644
index c489a99b33..0000000000
--- a/lib/core/reporters/helpers/format-rule-result.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*global helpers */
-
-helpers.formatRuleResult = function (ruleResult) {
-	'use strict';
-	
-	return {
-		id: ruleResult.id,
-		description: ruleResult.description,
-		help: ruleResult.help,
-		helpUrl: ruleResult.helpUrl || null,
-		impact: null,
-		tags: ruleResult.tags,
-		nodes: []
-	};
-};
diff --git a/lib/core/reporters/helpers/process-aggregate.js b/lib/core/reporters/helpers/process-aggregate.js
new file mode 100644
index 0000000000..c36d548e6d
--- /dev/null
+++ b/lib/core/reporters/helpers/process-aggregate.js
@@ -0,0 +1,64 @@
+/*global helpers */
+function normalizeRelatedNodes(node, xpath) {
+	'use strict';
+	['any','all','none'].forEach((type) => {
+		if (!Array.isArray(node[type])) {
+			return;
+		}
+		node[type].filter((checkRes) => Array.isArray(checkRes.relatedNodes))
+		.forEach((checkRes) => {
+			checkRes.relatedNodes = checkRes.relatedNodes.map((relatedNode) => {
+				var res = {
+					html: relatedNode.source,
+					target: relatedNode.selector
+				};
+				if (xpath) {
+					res.xpath = relatedNode.xpath;
+				}
+				return res;
+			});
+		});
+
+	});
+}
+
+var resultKeys = axe.constants.resultGroups;
+helpers.processAggregate = function (results, options) {
+	var resultObject = axe.utils.aggregateResult(results);
+
+	resultObject.timestamp = new Date().toISOString();
+	resultObject.url = window.location.href;
+
+	resultKeys.forEach(function (key) {
+		resultObject[key] = (resultObject[key] || []).map(function (ruleResult) {
+			ruleResult = Object.assign({}, ruleResult);
+
+			if (Array.isArray(ruleResult.nodes) && ruleResult.nodes.length > 0) {
+				ruleResult.nodes = ruleResult.nodes.map(function (subResult) {
+					if (typeof subResult.node === 'object') {
+						subResult.html = subResult.node.source;
+						subResult.target = subResult.node.selector;
+
+						if (options.xpath) {
+							subResult.xpath = subResult.node.xpath;
+						}
+					}
+					delete subResult.result;
+					delete subResult.node;
+
+					normalizeRelatedNodes(subResult, options.xpath);
+
+					return subResult;
+				});
+			}
+
+			resultKeys.forEach((key) => delete ruleResult[key]);
+			delete ruleResult.pageLevel;
+			delete ruleResult.result;
+
+			return ruleResult;
+		});
+	});
+
+	return resultObject;
+};
diff --git a/lib/core/reporters/helpers/split-results-checks.js b/lib/core/reporters/helpers/split-results-checks.js
deleted file mode 100644
index 1486e1330c..0000000000
--- a/lib/core/reporters/helpers/split-results-checks.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*global helpers */
-helpers.splitResultsWithChecks = function (results) {
-	'use strict';
-	return helpers.splitResults(results, helpers.formatChecks);
-};
diff --git a/lib/core/reporters/helpers/split-results.js b/lib/core/reporters/helpers/split-results.js
deleted file mode 100644
index 931d819746..0000000000
--- a/lib/core/reporters/helpers/split-results.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*global helpers */
-
-helpers.splitResults = function (results, nodeDataMapper) {
-	'use strict';
-
-	var violations = [],
-		passes = [];
-
-	results.forEach(function (rr) {
-
-		function mapNode(nodeData) {
-			var result = nodeData.result || rr.result;
-			var node = helpers.formatNode(nodeData.node);
-			node.impact = nodeData.impact || null;
-
-			return nodeDataMapper(node, nodeData, result);
-		}
-
-		var failResult,
-			passResult = helpers.formatRuleResult(rr);
-
-		failResult = axe.utils.clone(passResult);
-		failResult.impact = rr.impact || null;
-
-		failResult.nodes = rr.violations.map(mapNode);
-		passResult.nodes = rr.passes.map(mapNode);
-
-		if (failResult.nodes.length) {
-			violations.push(failResult);
-		}
-		if (passResult.nodes.length) {
-			passes.push(passResult);
-		}
-	});
-
-	return {
-		violations: violations,
-		passes: passes,
-		url: window.location.href,
-		timestamp: new Date().toISOString()
-	};
-};
diff --git a/lib/core/reporters/na.js b/lib/core/reporters/na.js
index 02931679ff..9b07c8b1e8 100644
--- a/lib/core/reporters/na.js
+++ b/lib/core/reporters/na.js
@@ -1,16 +1,21 @@
 /*global helpers */
-axe.reporter('na', function (results, callback) {
+
+axe.addReporter('na', function (results, options, callback) {
 	'use strict';
-	var na = results.filter(function (rr) {
-		return rr.violations.length === 0 && rr.passes.length === 0;
-	}).map(helpers.formatRuleResult);
 
-	var formattedResults = helpers.splitResultsWithChecks(results);
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
+
+	var out = helpers.processAggregate(results, options);
 	callback({
-		violations: formattedResults.violations,
-		passes: formattedResults.passes,
-		notApplicable: na,
-		timestamp: formattedResults.timestamp,
-		url: formattedResults.url
+		violations: out.violations,
+		passes: out.passes,
+		incomplete: out.incomplete,
+		inapplicable: out.inapplicable,
+		timestamp: out.timestamp,
+		url: out.url
 	});
 });
+
diff --git a/lib/core/reporters/no-passes.js b/lib/core/reporters/no-passes.js
index 30075059bf..be32c2d956 100644
--- a/lib/core/reporters/no-passes.js
+++ b/lib/core/reporters/no-passes.js
@@ -1,11 +1,16 @@
 /*global helpers */
-axe.reporter('no-passes', function (results, callback) {
+axe.addReporter('no-passes', function (results, options, callback) {
 	'use strict';
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
+	var out = helpers.processAggregate(results, options);
 
-	var formattedResults = helpers.splitResultsWithChecks(results);
 	callback({
-		violations: formattedResults.violations,
-		timestamp: formattedResults.timestamp,
-		url: formattedResults.url
+		violations: out.violations,
+		timestamp: out.timestamp,
+		url: out.url
 	});
+
 });
diff --git a/lib/core/reporters/raw.js b/lib/core/reporters/raw.js
index c7133876cc..56f85046b9 100644
--- a/lib/core/reporters/raw.js
+++ b/lib/core/reporters/raw.js
@@ -1,4 +1,8 @@
-axe.reporter('raw', function (results, callback) {
+axe.addReporter('raw', function (results, options, callback) {
 	'use strict';
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
 	callback(results);
 });
diff --git a/lib/core/reporters/v1.js b/lib/core/reporters/v1.js
index f9d9ae1971..c4c106627f 100644
--- a/lib/core/reporters/v1.js
+++ b/lib/core/reporters/v1.js
@@ -1,18 +1,25 @@
 /*global helpers */
 
-axe.reporter('v1', function (results, callback) {
+axe.addReporter('v1', function (results, options, callback) {
 	'use strict';
-	var formattedResults = helpers.splitResults(results, function (nodeResult, data, result) {
-		if (result === axe.constants.result.FAIL) {
-			nodeResult.failureSummary = helpers.failureSummary(data);
-		}
 
-		return nodeResult;
-	});
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
+	var out = helpers.processAggregate(results, options);
+
+	out.violations.forEach((result) => result.nodes.forEach((nodeResult) => {
+		nodeResult.failureSummary = helpers.failureSummary(nodeResult);
+	}));
+
 	callback({
-		violations: formattedResults.violations,
-		passes: formattedResults.passes,
-		timestamp: formattedResults.timestamp,
-		url: formattedResults.url
+		violations: out.violations,
+		passes: out.passes,
+		incomplete: out.incomplete,
+		inapplicable: out.inapplicable,
+		timestamp: out.timestamp,
+		url: out.url
 	});
+
 });
diff --git a/lib/core/reporters/v2.js b/lib/core/reporters/v2.js
index 3db7409269..e398804c29 100644
--- a/lib/core/reporters/v2.js
+++ b/lib/core/reporters/v2.js
@@ -1,13 +1,20 @@
 /*global helpers */
 
 
-axe.reporter('v2', function (results, callback) {
+axe.addReporter('v2', function (results, options, callback) {
 	'use strict';
-	var formattedResults = helpers.splitResultsWithChecks(results);
+	if (typeof options === 'function') {
+		callback = options;
+		options = {};
+	}
+	var out = helpers.processAggregate(results, options);
 	callback({
-		violations: formattedResults.violations,
-		passes: formattedResults.passes,
-		timestamp: formattedResults.timestamp,
-		url: formattedResults.url
+		violations: out.violations,
+		passes: out.passes,
+		incomplete: out.incomplete,
+		inapplicable: out.inapplicable,
+		timestamp: out.timestamp,
+		url: out.url
 	});
+
 }, true);
diff --git a/lib/core/utils/aggregate.js b/lib/core/utils/aggregate.js
new file mode 100644
index 0000000000..3315d68fdc
--- /dev/null
+++ b/lib/core/utils/aggregate.js
@@ -0,0 +1,22 @@
+/**
+ * From a list of values, find the one with the greatest weight according to
+ * the supplied map
+ * @param  {object} params Contains 3 properties:
+ * - map: a map indicating the order of values to run in
+ *        example: ['small', 'medium', 'large']
+ * - values: Array of values to take the highest from
+ * - initial: optional starting value
+ */
+axe.utils.aggregate = function (map, values, initial) {
+	values = values.slice();
+	if (initial) {
+		values.push(initial);
+	}
+
+	var sorting = values
+	.map((val) => map.indexOf(val))
+	.sort(); // Stupid NodeJS array.sort functor doesn't work!!
+
+	return map[sorting.pop()];
+};
+
diff --git a/lib/core/utils/aggregateChecks.js b/lib/core/utils/aggregateChecks.js
new file mode 100644
index 0000000000..dec080a003
--- /dev/null
+++ b/lib/core/utils/aggregateChecks.js
@@ -0,0 +1,73 @@
+let checkMap = [];
+checkMap[axe.constants.PASS_PRIO] = true;
+checkMap[axe.constants.CANTTELL_PRIO] = null;
+checkMap[axe.constants.FAIL_PRIO] = false;
+
+
+/**
+ * Map over the any / all / none properties
+ */
+let checkTypes = ['any', 'all', 'none'];
+function anyAllNone(obj, functor) {
+	return checkTypes.reduce(function (out, type) {
+		out[type] = (obj[type] || []).map((val) => functor(val, type));
+		return out;
+	}, {});
+}
+
+
+axe.utils.aggregateChecks = function (nodeResOriginal) {
+	// Create a copy
+	let nodeResult = Object.assign({}, nodeResOriginal);
+
+	// map each result value to a priority
+	anyAllNone(nodeResult, function (check, type) {
+		let i = checkMap.indexOf(check.result);
+		// default to cantTell
+		check.priority = i !== -1 ? i : axe.constants.CANTTELL_PRIO;
+
+		if (type === 'none') {
+			// For none, reverse the outcome
+			check.priority = 4 - check.priority;
+		}
+	});
+
+	// Find the result with the highest priority
+	let priorities = anyAllNone(nodeResult, (c) => c.priority);
+	nodeResult.priority = Math.max(
+		priorities.all.reduce((a, b) => Math.max(a,b), 0),
+		priorities.none.reduce((a, b) => Math.max(a,b), 0),
+		// get the lowest passing of 'any' defaulting
+		// to 0 by wrapping around 4 to 0 (inapplicable)
+		priorities.any.reduce((a, b) => Math.min(a,b), 4) % 4
+	);
+
+	// Of each type, filter out all results not matching the final priority
+	let impacts = [];
+	checkTypes.forEach((type) => {
+		nodeResult[type] = nodeResult[type].filter((check) => {
+			return check.priority === nodeResult.priority;
+		});
+		nodeResult[type].forEach((check) => impacts.push(check.impact));
+	});
+
+
+	// for failed nodes, define the impact
+	if (nodeResult.priority === axe.constants.FAIL_PRIO) {
+		nodeResult.impact = axe.utils.aggregate(axe.constants.impact, impacts);
+	} else {
+		nodeResult.impact = null;
+	}
+
+	// Delete the old result and priority properties
+	anyAllNone(nodeResult, (c) => {
+		delete c.result;
+		delete c.priority;
+	});
+
+	// Convert the index to a result string value
+	nodeResult.result = axe.constants.results[nodeResult.priority];
+	delete nodeResult.priority;
+
+	return nodeResult;
+};
\ No newline at end of file
diff --git a/lib/core/utils/aggregateResult.js b/lib/core/utils/aggregateResult.js
new file mode 100644
index 0000000000..8b993e4260
--- /dev/null
+++ b/lib/core/utils/aggregateResult.js
@@ -0,0 +1,40 @@
+function copyToGroup(resultObject, subResult, group) {
+	var resultCopy = Object.assign({}, subResult);
+	resultCopy.nodes = (resultCopy[group] || []).concat();
+	axe.constants.resultGroups.forEach((group) => {
+		delete resultCopy[group];
+	});
+	resultObject[group].push(resultCopy);
+}
+
+/**
+ * Calculates the result of a Rule based on its types and the result of its child Checks
+ * @param  {RuleResult} ruleResult The RuleResult to calculate the result of
+ */
+axe.utils.aggregateResult = function (results) {
+	let resultObject = {};
+
+	// Create an array for each type
+	axe.constants.resultGroups
+	.forEach((groupName) => resultObject[groupName] = []);
+
+	// Fill the array with nodes
+	results.forEach(function (subResult) {
+		if (subResult.error) {
+			copyToGroup(resultObject, subResult, axe.constants.CANTTELL_GROUP);
+
+		} else if (subResult.result === axe.constants.NA) {
+			copyToGroup(resultObject, subResult, axe.constants.NA_GROUP);
+
+		} else {
+			axe.constants.resultGroups
+			.forEach(function (group) {
+				if (Array.isArray(subResult[group]) && subResult[group].length > 0	) {
+					copyToGroup(resultObject, subResult, group);
+				}
+			});
+		}
+
+	});
+	return resultObject;
+};
diff --git a/lib/core/utils/aggregateRule.js b/lib/core/utils/aggregateRule.js
new file mode 100644
index 0000000000..5cf07d3408
--- /dev/null
+++ b/lib/core/utils/aggregateRule.js
@@ -0,0 +1,53 @@
+(function () {
+
+/**
+ * Calculates the result of a Rule based on its types and the result of its child Checks
+ * @param  {RuleResult} ruleResult The RuleResult to calculate the result of
+ */
+axe.utils.aggregateRule = function (subResults) {
+	let ruleResult = {};
+
+	// For each node, retrieve the result and impact
+	subResults = subResults.map(function (subResult) {
+		// Known result
+		if (subResult.any && subResult.all && subResult.none) {
+			return axe.utils.aggregateChecks(subResult);
+
+		} else if (Array.isArray(subResult.node)) {
+			return axe.utils.finalizeRuleResult(subResult);
+
+		} else {
+			throw new TypeError('Invalid Result type');
+		}
+	});
+
+	// Aggregate the result
+	let resultList = subResults.map((node) => node.result);
+	ruleResult.result = axe.utils.aggregate(axe.constants.results, resultList, ruleResult.result);
+
+	// Create an array for each type
+	axe.constants.resultGroups
+	.forEach((group) => ruleResult[group] = []);
+
+	// Fill the array with nodes
+	subResults.forEach(function (subResult) {
+		var groupName = axe.constants.resultGroupMap[subResult.result];
+		ruleResult[groupName].push(subResult);
+	});
+
+	// Take the highest impact of failed rules
+	var failGroup = axe.constants.FAIL_GROUP;
+	if (ruleResult[failGroup].length > 0) {
+		// Get the impact of all violations
+		let impactList = ruleResult[failGroup]
+		.map((failure) => failure.impact);
+
+		ruleResult.impact = axe.utils.aggregate(axe.constants.impact, impactList) || null;
+	} else {
+		ruleResult.impact = null;
+	}
+
+	return ruleResult;
+};
+
+}());
\ No newline at end of file
diff --git a/lib/core/utils/collect-results-from-frames.js b/lib/core/utils/collect-results-from-frames.js
index f7830c7f4e..4a665d31da 100644
--- a/lib/core/utils/collect-results-from-frames.js
+++ b/lib/core/utils/collect-results-from-frames.js
@@ -5,10 +5,10 @@ function err(message, node) {
 }
 
 /**
- * Sends a command to the sepecified frame
+ * Sends a command to an instance of axe in the specified frame
  * @param  {Element}  node       The frame element to send the message to
  * @param  {Object}   parameters Parameters to pass to the frame
- * @param  {Function} callback   Function to call when results from all frames have returned
+ * @param  {Function} callback   Function to call when results from the frame has returned
  */
 axe.utils.sendCommandToFrame = function(node, parameters, resolve, reject) {
 	'use strict';
@@ -20,6 +20,7 @@ axe.utils.sendCommandToFrame = function(node, parameters, resolve, reject) {
 		return;
 	}
 
+	// give the frame .5s to respond to 'axe.ping', else log failed response
 	var timeout = setTimeout(function() {
 		// This double timeout is important for allowing iframes to respond
 		// DO NOT REMOVE
@@ -34,13 +35,17 @@ axe.utils.sendCommandToFrame = function(node, parameters, resolve, reject) {
 		}, 0);
 	}, 500);
 
+	// send 'axe.ping' to the frame
 	axe.utils.respondable(win, 'axe.ping', null, undefined, function() {
 		clearTimeout(timeout);
+
+		// Give aXe 30s to respond to 'axe.start'
 		timeout = setTimeout(function() {
 			reject(err('Axe in frame timed out', node));
 		}, 30000);
 
-		axe.utils.respondable(win, 'axe.start', parameters, true, function(data) {
+		// send 'axe.start' and send the callback if it responded
+		axe.utils.respondable(win, 'axe.start', parameters, undefined, function(data) {
 			clearTimeout(timeout);
 			if (data instanceof Error === false) {
 				resolve(data);
@@ -54,10 +59,12 @@ axe.utils.sendCommandToFrame = function(node, parameters, resolve, reject) {
 
 
 /**
- * Sends a message to frames to start analysis and collate results (via `mergeResults`)
+ * Sends a message to axe running in frames to start analysis and collate results (via `mergeResults`)
  * @private
- * @param  {Context}   context  The resolved Context object
+ * @param  {Context}  context   The resolved Context object
  * @param  {Object}   options   Options object (as passed to `runRules`)
+ * @param  {string}   command   Command sent to all frames
+ * @param  {Array}    parameter Array of values to be passed along side the command
  * @param  {Function} callback  Function to call when results from all frames have returned
  */
 function collectResultsFromFrames(context, options, command, parameter, resolve, reject) {
@@ -66,7 +73,8 @@ function collectResultsFromFrames(context, options, command, parameter, resolve,
 	var q = axe.utils.queue();
 	var frames = context.frames;
 
-	function defer(frame) {
+	// Tell each axe running in each frame to collect results
+	frames.forEach(function (frame) {
 		var params = {
 			options: options,
 			command: command,
@@ -92,53 +100,12 @@ function collectResultsFromFrames(context, options, command, parameter, resolve,
 				res(null);
 			}, rej);
 		});
-	}
-
-	for (var i = 0, l = frames.length; i < l; i++) {
-		defer(frames[i]);
-	}
+	});
 
+	// Combine results from all frames and give it back
 	q.then(function(data) {
 		resolve(axe.utils.mergeResults(data));
 	}).catch(reject);
 }
 
 axe.utils.collectResultsFromFrames = collectResultsFromFrames;
-
-
-
-/**
- * Sends a message to frames to start analysis and collate results (via `mergeResults`)
- * @private
- * @param  {Context}   context  The resolved Context object
- * @param  {Object}   options   Options object (as passed to `runRules`)
- * @param  {Function} callback  Function to call when results from all frames have returned
- */
-function runFrameAudit(frame, options, resolve, reject) {
-	'use strict';
-	var node = frame.node;
-	var params = {
-		options: options,
-		command:  'rules',
-		parameter: null,
-		context: {
-			initiator: false,
-			page: true,
-			include: frame.include || [],
-			exclude: frame.exclude || []
-		}
-	};
-	axe.utils.sendCommandToFrame(node, params, function(data) {
-		if (data) {
-			return resolve({
-				results: data,
-				frameElement: node,
-				frame: axe.utils.getSelector(node)
-			});
-		}
-		// frame did not return data
-		resolve(null);
-	}, reject);
-}
-
-axe.utils.runFrameAudit = runFrameAudit;
diff --git a/lib/core/utils/dq-element.js b/lib/core/utils/dq-element.js
index 763cbab242..735540a753 100644
--- a/lib/core/utils/dq-element.js
+++ b/lib/core/utils/dq-element.js
@@ -39,6 +39,11 @@ function DqElement(element, spec) {
 	 */
 	this.selector = spec.selector || [axe.utils.getSelector(element)];
 
+	/**
+	 * Xpath to the element
+	 */
+	this.xpath = spec.xpath || [axe.utils.getXpath(element)];
+
 	/**
 	 * The generated HTML source code of the element
 	 * @type {String}
@@ -57,8 +62,15 @@ DqElement.prototype.toJSON = function () {
 	'use strict';
 	return {
 		selector: this.selector,
-		source: this.source
+		source: this.source,
+		xpath: this.xpath
 	};
 };
 
+DqElement.fromFrame = function (node, frame) {
+    node.selector.unshift(frame.selector);
+    node.xpath.unshift(frame.xpath);
+    return new axe.utils.DqElement(frame.element, node);
+};
+
 axe.utils.DqElement = DqElement;
diff --git a/lib/core/utils/extend-blacklist.js b/lib/core/utils/extend-blacklist.js
deleted file mode 100644
index 09ba384538..0000000000
--- a/lib/core/utils/extend-blacklist.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/**
- * Extends metadata onto result object and executes any functions.  Will not deeply extend.
- * @param  {Object} to   The target of the extend
- * @param  {Object} from Metadata to extend
- * @param  {Array}  blacklist property names to exclude from resulting object
- */
-axe.utils.extendBlacklist = function (to, from, blacklist) {
-	'use strict';
-	blacklist = blacklist || [];
-
-	for (var i in from) {
-		if (from.hasOwnProperty(i) && blacklist.indexOf(i) === -1) {
-			to[i] = from[i];
-		}
-	}
-
-	return to;
-};
diff --git a/lib/core/utils/extend-meta-data.js b/lib/core/utils/extend-meta-data.js
index ccb6fc7e46..75b9c8087b 100644
--- a/lib/core/utils/extend-meta-data.js
+++ b/lib/core/utils/extend-meta-data.js
@@ -5,19 +5,12 @@
  * @param  {Object} from Metadata to extend
  */
 axe.utils.extendMetaData = function (to, from) {
-	'use strict';
-
-	for (var i in from) {
-		if (from.hasOwnProperty(i)) {
-			if (typeof from[i] === 'function') {
-				try {
-					to[i] = from[i](to);
-				} catch (e) {
-					to[i] = null;
-				}
-			} else {
-				to[i] = from[i];
-			}
-		}
-	}
+	Object.assign(to, from);
+	Object.keys(from).filter( prop => typeof from[prop] === 'function' )
+	.forEach( prop => {
+		to[prop] = null;
+		try {
+			to[prop] = from[prop](to);
+		} catch(e) { }
+	});
 };
\ No newline at end of file
diff --git a/lib/core/utils/finalize-result.js b/lib/core/utils/finalize-result.js
index 9e7305ce33..b42937aa04 100644
--- a/lib/core/utils/finalize-result.js
+++ b/lib/core/utils/finalize-result.js
@@ -1,107 +1,11 @@
-
-
-function raiseMetadata(obj, checks) {
-	'use strict';
-
-	Object.keys(axe.constants.raisedMetadata).forEach(function (key) {
-		var collection = axe.constants.raisedMetadata[key];
-		var highestIndex = checks.reduce(function (prevIndex, current) {
-		  var currentIndex = collection.indexOf(current[key]);
-		  return currentIndex > prevIndex ? currentIndex : prevIndex;
-		}, -1);
-		if (collection[highestIndex]) {
-			obj[key] = collection[highestIndex];
-		}
-	});
-
-}
-
-/**
- * Calculates the result (PASS or FAIL) of a Node (node-level) or an entire Rule (page-level)
- * @private
- * @param  {Array} checks  Array of checks to calculate the result of
- * @return {String}        Either "PASS" or "FAIL"
- */
-function calculateCheckResult(failingChecks) {
-	'use strict';
-	var isFailing = failingChecks.any.length || failingChecks.all.length || failingChecks.none.length;
-
-	return isFailing ? axe.constants.result.FAIL : axe.constants.result.PASS;
-}
-
-/**
- * Iterates and calculates the results of each Node and then rolls the result up to the parent RuleResult
- * @private
- * @param  {RuleResult} ruleResult The RuleResult to test
- */
-function calculateRuleResult(ruleResult) {
-	'use strict';
-	function checkMap(check) {
-		return axe.utils.extendBlacklist({}, check, ['result']);
-	}
-
-
-	var newRuleResult = axe.utils.extendBlacklist({
-		violations: [],
-		passes: []
-	}, ruleResult, ['nodes']);
-
-	ruleResult.nodes.forEach(function (detail) {
-
-		var failingChecks = axe.utils.getFailingChecks(detail);
-		var result = calculateCheckResult(failingChecks);
-
-		if (result === axe.constants.result.FAIL) {
-			raiseMetadata(detail, axe.utils.getAllChecks(failingChecks));
-			detail.any = failingChecks.any.map(checkMap);
-			detail.all = failingChecks.all.map(checkMap);
-			detail.none = failingChecks.none.map(checkMap);
-			newRuleResult.violations.push(detail);
-			return;
-		}
-
-		detail.any = detail.any.filter(function (check) {
-			return check.result;
-		}).map(checkMap);
-		// no need to filter `all` or `none` since we know they all pass
-		detail.all = detail.all.map(checkMap);
-		detail.none = detail.none.map(checkMap);
-
-		newRuleResult.passes.push(detail);
-	});
-	raiseMetadata(newRuleResult, newRuleResult.violations);
-
-	newRuleResult.result = newRuleResult.violations.length ? axe.constants.result.FAIL :
-		(newRuleResult.passes.length ? axe.constants.result.PASS : newRuleResult.result);
-
-	return newRuleResult;
-}
-
-axe.utils.getFailingChecks = function (detail) {
-	'use strict';
-
-	var any = detail.any.filter(function (check) {
-		return !check.result;
-	});
-	return {
-		all: detail.all.filter(function (check) {
-			return !check.result;
-		}),
-		any: any.length === detail.any.length ? any : [],
-		none: detail.none.filter(function (check) {
-			return !!check.result;
-		})
-	};
-};
-
-
 /**
- * Calculates the result of a Rule based on its types and the result of its child Checks
- * @param  {RuleResult} ruleResult The RuleResult to calculate the result of
+ * Process rule results, grouping them by outcome
+ * @param ruleResult {object}
+ * @return {object}
  */
 axe.utils.finalizeRuleResult = function (ruleResult) {
-	'use strict';
+	Object.assign(ruleResult, axe.utils.aggregateRule(ruleResult.nodes));
+	delete ruleResult.nodes;
 
-	axe.utils.publishMetaData(ruleResult);
-	return calculateRuleResult(ruleResult);
+	return ruleResult;
 };
diff --git a/lib/core/utils/find-by.js b/lib/core/utils/find-by.js
index 94b6b5c3e9..c9b8ebf2ab 100644
--- a/lib/core/utils/find-by.js
+++ b/lib/core/utils/find-by.js
@@ -7,13 +7,7 @@
  * @return {Object}       The first matching object or `undefined` if no match
  */
 axe.utils.findBy = function (array, key, value) {
-	'use strict';
-	array = array || [];
-
-	var index, length;
-	for (index = 0, length = array.length; index < length; index++) {
-		if (array[index][key] === value) {
-			return array[index];
-		}
+	if (Array.isArray(array)) {
+		return array.find( obj => typeof obj === 'object' && obj[key] === value );
 	}
 };
\ No newline at end of file
diff --git a/lib/core/utils/get-xpath.js b/lib/core/utils/get-xpath.js
new file mode 100644
index 0000000000..3308df1b16
--- /dev/null
+++ b/lib/core/utils/get-xpath.js
@@ -0,0 +1,85 @@
+/*global axe */
+
+//jshint maxstatements: false, maxcomplexity: false
+function getXPathArray(node, path) {
+	var sibling, count;
+	// Gets an XPath for an element which describes its hierarchical location.
+	if(!node) {
+		return [];
+	}
+	if (!path && node.nodeType === 9) {
+		// special case for when we are called and give the document itself as the starting node
+		path = [{
+			str: 'html'
+		}];
+		return path;
+	}
+	path = path || [];
+	if (node.parentNode && node.parentNode !== node) {
+		path = getXPathArray(node.parentNode, path);
+	}
+
+	if (node.previousSibling) {
+		count = 1;
+		sibling = node.previousSibling;
+		do {
+			if(sibling.nodeType === 1 && sibling.nodeName === node.nodeName) {
+				count++;
+			}
+			sibling = sibling.previousSibling;
+		}
+		while (sibling);
+		if(count === 1) {
+			count = null;
+		}
+	} else if (node.nextSibling) {
+
+		sibling = node.nextSibling;
+		do {
+			if(sibling.nodeType === 1 && sibling.nodeName === node.nodeName) {
+				count = 1;
+				sibling = null;
+			} else {
+				count = null;
+				sibling = sibling.previousSibling;
+			}
+		} while (sibling);
+	}
+
+	if(node.nodeType === 1) {
+		var element = {};
+		element.str = node.nodeName.toLowerCase();
+		// add the id and the count so we can construct robust versions of the xpath
+		if(node.getAttribute && node.getAttribute('id') &&
+			node.ownerDocument.querySelectorAll('#' + axe.utils.escapeSelector(node.id)).length === 1) {
+
+			element.id = node.getAttribute('id');
+		}
+		if(count > 1) {
+			element.count = count;
+		}
+		path.push(element);
+	}
+	return path;
+}
+
+// Robust is intended to allow xpaths to be robust to changes in the HTML structure of the page
+// This means always use the id when present
+// Non robust means always use the count (i.e. the exact position of the element)
+// Ironically this is a bit of a misnomer because in very, very dynamic pages (e.g. where ids are generated on the fly)
+// the non-ribust Xpaths will work whereas the robust ones will not work
+function xpathToString(xpathArray) {
+	return xpathArray.reduce((str, elm) => 	{
+		if(elm.id) {
+			return `/${elm.str}[@id='${elm.id}']`;
+
+		} else {
+			return str + `/${elm.str}` + (elm.count > 0 ? `[${elm.count}]` : '');
+		}
+	}, '');
+}
+
+axe.utils.getXpath = function getXpath(node) {
+	var xpathArray = getXPathArray(node);
+	return xpathToString(xpathArray);
+};
diff --git a/lib/core/utils/merge-results.js b/lib/core/utils/merge-results.js
index 8f736038d2..3651e6a4ed 100644
--- a/lib/core/utils/merge-results.js
+++ b/lib/core/utils/merge-results.js
@@ -8,16 +8,22 @@
 */
 function pushFrame(resultSet, frameElement, frameSelector) {
   'use strict';
+  var frameXpath = axe.utils.getXpath(frameElement);
+  var frameSpec = {
+    element: frameElement,
+    selector: frameSelector,
+    xpath: frameXpath
+  };
+
   resultSet.forEach(function (res) {
-    res.node.selector.unshift(frameSelector);
-    res.node = new axe.utils.DqElement(frameElement, res.node);
+    res.node = axe.utils.DqElement.fromFrame(res.node, frameSpec);
+
     var checks = axe.utils.getAllChecks(res);
     if (checks.length) {
       checks.forEach(function (check) {
-        check.relatedNodes.forEach(function (node) {
-          node.selector.unshift(frameSelector);
-          node = new axe.utils.DqElement(frameElement, node);
-        });
+        check.relatedNodes = check.relatedNodes.map(
+          (node) => axe.utils.DqElement.fromFrame(node, frameSpec)
+        );
       });
     }
   });
diff --git a/lib/core/utils/pollyfills.js b/lib/core/utils/pollyfills.js
new file mode 100644
index 0000000000..627a27209e
--- /dev/null
+++ b/lib/core/utils/pollyfills.js
@@ -0,0 +1,167 @@
+// jshint ignore: start
+/*
+ These pollyfills came directly from the ES Specification it's self
+ Contained within:
+  - Object.assign
+  - Array.prototype.find
+*/
+if (typeof Object.assign !== 'function') {
+  (function () {
+    Object.assign = function (target) {
+      'use strict';
+      if (target === undefined || target === null) {
+        throw new TypeError('Cannot convert undefined or null to object');
+      }
+
+      var output = Object(target);
+      for (var index = 1; index < arguments.length; index++) {
+        var source = arguments[index];
+        if (source !== undefined && source !== null) {
+          for (var nextKey in source) {
+            if (source.hasOwnProperty(nextKey)) {
+              output[nextKey] = source[nextKey];
+            }
+          }
+        }
+      }
+      return output;
+    };
+  })();
+}
+
+if (!Array.prototype.find) {
+  Array.prototype.find = function(predicate) {
+    if (this === null) {
+      throw new TypeError('Array.prototype.find called on null or undefined');
+    }
+    if (typeof predicate !== 'function') {
+      throw new TypeError('predicate must be a function');
+    }
+    var list = Object(this);
+    var length = list.length >>> 0;
+    var thisArg = arguments[1];
+    var value;
+
+    for (var i = 0; i < length; i++) {
+      value = list[i];
+      if (predicate.call(thisArg, value, i, list)) {
+        return value;
+      }
+    }
+    return undefined;
+  };
+}
+
+
+axe.utils.pollyfillElementsFromPoint = function () {
+  if (document.elementsFromPoint) return document.elementsFromPoint;
+  if (document.msElementsFromPoint) return document.msElementsFromPoint;
+
+  var usePointer = (function () {
+    var element = document.createElement('x');
+    element.style.cssText = 'pointer-events:auto';
+    return element.style.pointerEvents === 'auto';
+  }());
+
+  var cssProp = usePointer ? 'pointer-events' : 'visibility';
+  var cssDisableVal = usePointer ? 'none' : 'hidden';
+
+  var style = document.createElement('style');
+  style.innerHTML = usePointer ? 
+    '* { pointer-events: all }' : '* { visibility: visible }';
+
+  return function (x, y) {
+    var current, i, d;
+    var elements = [];
+    var previousPointerEvents = [];
+
+    // startup
+    document.head.appendChild(style);
+
+    while ((current = document.elementFromPoint(x, y)) && elements.indexOf(current) === -1) {
+      // push the element and its current style
+      elements.push(current);
+
+      previousPointerEvents.push({
+        value: current.style.getPropertyValue(cssProp),
+        priority: current.style.getPropertyPriority(cssProp)
+      });
+
+      // add "pointer-events: none", to get to the underlying element
+      current.style.setProperty(cssProp, cssDisableVal, 'important');
+    }
+
+    // restore the previous pointer-events values
+    for (i = previousPointerEvents.length; !!(d = previousPointerEvents[--i]);) {
+      elements[i].style.setProperty(cssProp, d.value ? d.value : '', d.priority);
+    }
+
+    // teardown;
+    document.head.removeChild(style);
+
+    return elements;
+  }
+};
+
+
+if (typeof window.addEventListener === 'function') {
+  document.elementsFromPoint = axe.utils.pollyfillElementsFromPoint();
+}
+
+
+if (!Array.prototype.includes) {
+  Array.prototype.includes = function(searchElement /*, fromIndex*/ ) {
+    'use strict';
+    var O = Object(this);
+    var len = parseInt(O.length, 10) || 0;
+    if (len === 0) {
+      return false;
+    }
+    var n = parseInt(arguments[1], 10) || 0;
+    var k;
+    if (n >= 0) {
+      k = n;
+    } else {
+      k = len + n;
+      if (k < 0) {k = 0;}
+    }
+    var currentElement;
+    while (k < len) {
+      currentElement = O[k];
+      if (searchElement === currentElement ||
+         (searchElement !== searchElement && currentElement !== currentElement)) { // NaN !== NaN
+        return true;
+      }
+      k++;
+    }
+    return false;
+  };
+}
+
+// Production steps of ECMA-262, Edition 5, 15.4.4.17
+// Reference: http://es5.github.io/#x15.4.4.17
+if (!Array.prototype.some) {
+  Array.prototype.some = function(fun/*, thisArg*/) {
+    'use strict';
+
+    if (this == null) {
+      throw new TypeError('Array.prototype.some called on null or undefined');
+    }
+
+    if (typeof fun !== 'function') {
+      throw new TypeError();
+    }
+
+    var t = Object(this);
+    var len = t.length >>> 0;
+
+    var thisArg = arguments.length >= 2 ? arguments[1] : void 0;
+    for (var i = 0; i < len; i++) {
+      if (i in t && fun.call(thisArg, t[i], i, t)) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+}
\ No newline at end of file
diff --git a/lib/core/utils/publish-metadata.js b/lib/core/utils/publish-metadata.js
index 1ffb215a64..c1efe04948 100644
--- a/lib/core/utils/publish-metadata.js
+++ b/lib/core/utils/publish-metadata.js
@@ -4,7 +4,8 @@ function extender(checksData, shouldBeTrue) {
 	return function (check) {
 		var sourceData = checksData[check.id] || {};
 		var messages = sourceData.messages || {};
-		var data = axe.utils.extendBlacklist({}, sourceData, ['messages']);
+		var data = Object.assign({}, sourceData);
+		delete data.messages;
 		data.message = check.result === shouldBeTrue ? messages.pass : messages.fail;
 		axe.utils.extendMetaData(check, data);
 	};
diff --git a/lib/core/utils/respondable.js b/lib/core/utils/respondable.js
index 33fc33e2a3..e7394ec59d 100644
--- a/lib/core/utils/respondable.js
+++ b/lib/core/utils/respondable.js
@@ -96,6 +96,9 @@
 
 	/**
 	 * Subscribe to messages sent via the `respondable` module.
+	 *
+	 * Axe._load uses this to listen for messages from other frames
+	 *
 	 * @param  {String}   topic    The topic to listen to
 	 * @param  {Function} callback The function to invoke when a message is received
 	 */
@@ -103,6 +106,16 @@
 		subscribers[topic] = callback;
 	};
 
+
+	/**
+	 * checks if the current context is inside a frame
+	 * @return {Boolean}
+	 */
+	respondable.isInFrame = function (win) {
+		win = win || window;
+		return !!win.frameElement;
+	};
+
 	/**
 	 * Helper closure to create a function that may be used to respond to a message
 	 * @private
diff --git a/lib/core/utils/rule-should-run.js b/lib/core/utils/rule-should-run.js
index 9a1eb412a3..2803885ec1 100644
--- a/lib/core/utils/rule-should-run.js
+++ b/lib/core/utils/rule-should-run.js
@@ -6,8 +6,10 @@
  * @return {bool}
  */
 function matchTags(rule, runOnly) {
+	// jshint maxcomplexity: 11
 	'use strict';
 	var include, exclude, matching;
+	var defaultExclude = (axe._audit && axe._audit.tagExclude) ? axe._audit.tagExclude : [];
 
 	// normalize include/exclude
 	if (runOnly.include || runOnly.exclude) {
@@ -17,22 +19,27 @@ function matchTags(rule, runOnly) {
 
 		exclude = runOnly.exclude || [];
 		exclude = Array.isArray(exclude) ? exclude : [exclude];
+		// add defaults, unless mentioned in include
+		exclude = exclude.concat(defaultExclude.filter(function (tag) {
+			return include.indexOf(tag) === -1;
+		}));
 
 	// Otherwise, only use the include value, ignore exclude
 	} else {
 		include = Array.isArray(runOnly) ? runOnly : [runOnly];
-		exclude = [];
+		// exclude the defaults not included
+		exclude = defaultExclude.filter(function (tag) {
+			return include.indexOf(tag) === -1;
+		});
 	}
 
 	matching = include.some(function (tag) {
-		return (rule.tags.indexOf(tag) !== -1);
+		return rule.tags.indexOf(tag) !== -1;
 	});
-
-	if (matching) {
-		return !exclude.some(function (tag) {
-			return (rule.tags.indexOf(tag) !== -1);
+	if (matching || (include.length === 0 && rule.enabled !== false)) {
+		return exclude.every(function (tag) {
+			return rule.tags.indexOf(tag) === -1;
 		});
-
 	} else {
 		return false;
 	}
@@ -67,9 +74,9 @@ axe.utils.ruleShouldRun = function (rule, context, options) {
 	} else if(runOnly.type === 'tag' && runOnly.values) {
 		return matchTags(rule, runOnly.values);
 
-	// If nothing is set, use the default
+	// If nothing is set, only check for default excludes
 	} else {
-		return !!rule.enabled;
+		return matchTags(rule, []);
 	}
 
 };
\ No newline at end of file
diff --git a/lib/checks/aria/allowed-attr-matches.js b/lib/rules/aria-allowed-attr-matches.js
similarity index 99%
rename from lib/checks/aria/allowed-attr-matches.js
rename to lib/rules/aria-allowed-attr-matches.js
index 6045df0f7d..9c7939a3d9 100644
--- a/lib/checks/aria/allowed-attr-matches.js
+++ b/lib/rules/aria-allowed-attr-matches.js
@@ -1,4 +1,3 @@
-
 var role = node.getAttribute('role');
 if (!role) {
 	role = axe.commons.aria.implicitRole(node);
diff --git a/lib/rules/aria-allowed-attr.json b/lib/rules/aria-allowed-attr.json
index 733f10849f..e80522a106 100644
--- a/lib/rules/aria-allowed-attr.json
+++ b/lib/rules/aria-allowed-attr.json
@@ -1,5 +1,6 @@
 {
   "id": "aria-allowed-attr",
+  "matches": "aria-allowed-attr-matches.js",
   "tags": [
     "wcag2a",
     "wcag411",
diff --git a/lib/checks/aria/has-attr-matches.js b/lib/rules/aria-has-attr-matches.js
similarity index 100%
rename from lib/checks/aria/has-attr-matches.js
rename to lib/rules/aria-has-attr-matches.js
diff --git a/lib/rules/aria-valid-attr-value.json b/lib/rules/aria-valid-attr-value.json
index 2f480f1286..8cdba3f873 100644
--- a/lib/rules/aria-valid-attr-value.json
+++ b/lib/rules/aria-valid-attr-value.json
@@ -1,5 +1,6 @@
 {
   "id": "aria-valid-attr-value",
+  "matches": "aria-has-attr-matches.js",
   "tags": [
     "wcag2a",
     "wcag131",
diff --git a/lib/rules/aria-valid-attr.json b/lib/rules/aria-valid-attr.json
index 4d4d4319aa..75c14a7232 100644
--- a/lib/rules/aria-valid-attr.json
+++ b/lib/rules/aria-valid-attr.json
@@ -1,5 +1,6 @@
 {
   "id": "aria-valid-attr",
+  "matches": "aria-has-attr-matches.js",
   "tags": [
     "wcag2a",
     "wcag411"
diff --git a/lib/checks/color/color-contrast-matches.js b/lib/rules/color-contrast-matches.js
similarity index 98%
rename from lib/checks/color/color-contrast-matches.js
rename to lib/rules/color-contrast-matches.js
index 9748e200e4..162f58c006 100644
--- a/lib/checks/color/color-contrast-matches.js
+++ b/lib/rules/color-contrast-matches.js
@@ -1,3 +1,5 @@
+/* global document */
+
 var nodeName = node.nodeName.toUpperCase(),
 	nodeType = node.type,
 	doc = document;
diff --git a/lib/rules/color-contrast.json b/lib/rules/color-contrast.json
index 3593045487..36420700be 100644
--- a/lib/rules/color-contrast.json
+++ b/lib/rules/color-contrast.json
@@ -1,10 +1,10 @@
 {
   "id": "color-contrast",
+  "matches": "color-contrast-matches.js",
   "excludeHidden": false,
   "options": {
     "noScroll": false
   },
-  "selector": "*",
   "tags": [
     "wcag2aa",
     "wcag143"
diff --git a/lib/rules/document-title.json b/lib/rules/document-title.json
index 8f3cf48cd1..23ae8511fb 100644
--- a/lib/rules/document-title.json
+++ b/lib/rules/document-title.json
@@ -1,6 +1,7 @@
 {
   "id": "document-title",
   "selector": "html",
+  "matches": "window-is-top.js",
   "tags": [
     "wcag2a",
     "wcag242"
diff --git a/lib/rules/frame-title-has-text.js b/lib/rules/frame-title-has-text.js
new file mode 100644
index 0000000000..f4339b677b
--- /dev/null
+++ b/lib/rules/frame-title-has-text.js
@@ -0,0 +1,2 @@
+var title = node.getAttribute('title');
+return !!(title ? axe.commons.text.sanitize(title).trim() : '');
\ No newline at end of file
diff --git a/lib/rules/frame-title-unique.json b/lib/rules/frame-title-unique.json
new file mode 100644
index 0000000000..8b954b04a1
--- /dev/null
+++ b/lib/rules/frame-title-unique.json
@@ -0,0 +1,17 @@
+{
+  "id": "frame-title-unique",
+  "selector": "frame[title]:not([title='']), iframe[title]:not([title=''])",
+  "matches": "frame-title-has-text.js",
+  "tags": [
+    "best-practice"
+  ],
+  "metadata": {
+    "description": "Ensures <iframe> and <frame> elements contain a unique title attribute",
+    "help": "Frames must have a unique title attribute"
+  },
+  "all": [],
+  "any": [],
+  "none": [
+    "unique-frame-title"
+  ]
+}
diff --git a/lib/rules/frame-title.json b/lib/rules/frame-title.json
index 20d13fda04..919b98c600 100644
--- a/lib/rules/frame-title.json
+++ b/lib/rules/frame-title.json
@@ -8,14 +8,16 @@
     "section508.22.i"
   ],
   "metadata": {
-    "description": "Ensures <iframe> and <frame> elements contain a unique and non-empty title attribute",
-    "help": "Frames must have unique title attribute"
+    "description": "Ensures <iframe> and <frame> elements contain a non-empty title attribute",
+    "help": "Frames must have title attribute"
   },
   "all": [],
   "any": [
-    "non-empty-title"
+    "aria-label",
+    "aria-labelledby",
+    "non-empty-title",
+    "role-presentation",
+    "role-none"
   ],
-  "none": [
-    "unique-frame-title"
-  ]
+  "none": []
 }
diff --git a/lib/rules/window-is-top.js b/lib/rules/window-is-top.js
new file mode 100644
index 0000000000..d0de3a777d
--- /dev/null
+++ b/lib/rules/window-is-top.js
@@ -0,0 +1,2 @@
+/* global window */
+return window.self === window.top;
\ No newline at end of file
diff --git a/package.json b/package.json
index 5f18ca60d4..bda17e0089 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "2.0.7",
+  "version": "2.1.7",
   "license": "MPL-2.0",
   "contributors": [
     {
@@ -47,7 +47,8 @@
   "typings": "axe.d.ts",
   "scripts": {
     "build": "grunt",
-    "test": "grunt test"
+    "test": "grunt test",
+    "test-fast": "grunt test-fast"
   },
   "devDependencies": {
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
@@ -69,6 +70,7 @@
     "grunt-contrib-uglify": "~1.0.1",
     "grunt-contrib-watch": "~1.0.0",
     "grunt-mocha": "~0.4.13",
+    "grunt-parallel": "^0.4.1",
     "grunt-snyk": "^0.1.0",
     "html-entities": "^1.2.0",
     "jquery": "^3.0.0",
diff --git a/test/checks/.jshintrc b/test/checks/.jshintrc
index 8fef56841f..83f8eee74e 100644
--- a/test/checks/.jshintrc
+++ b/test/checks/.jshintrc
@@ -44,7 +44,7 @@
 	"maxdepth": 15,
 	"maxstatements": 250,
 	"maxcomplexity": 50,
-	"maxlen": 180,
+	"maxlen": 1000,
 
 	"asi": false,
 	"boss" : false,
diff --git a/test/checks/aria/allowed-attr.js b/test/checks/aria/allowed-attr.js
index 17f418c4c1..91a05f5429 100644
--- a/test/checks/aria/allowed-attr.js
+++ b/test/checks/aria/allowed-attr.js
@@ -107,60 +107,4 @@ describe('aria-allowed-attr', function () {
 
 	});
 
-	describe('matches', function () {
-		it('should return false on elements with no role or no implicit role', function () {
-			var orig = axe.commons.aria.implicitRole;
-			axe.commons.aria.implicitRole = function (nd) {
-				assert.equal(nd, div);
-				return null;
-			};
-			var div = document.createElement('div');
-			fixture.appendChild(div);
-
-			assert.isFalse(checks['aria-allowed-attr'].matches(div));
-			axe.commons.aria.implicitRole = orig;
-		});
-
-		it('should return false on elements that have no allowed attributes', function () {
-			var orig = axe.commons.aria.allowedAttr;
-			axe.commons.aria.allowedAttr = function (role) {
-				assert.equal(role, 'button');
-				return null;
-			};
-			var div = document.createElement('div');
-			div.setAttribute('role', 'button');
-			fixture.appendChild(div);
-
-			assert.isFalse(checks['aria-allowed-attr'].matches(div));
-			axe.commons.aria.allowedAttr = orig;
-		});
-
-		it('should return false on elements that have a role but no aria attributes', function () {
-			var div = document.createElement('div');
-			div.setAttribute('role', 'button');
-			fixture.appendChild(div);
-
-			assert.isFalse(checks['aria-allowed-attr'].matches(div));
-		});
-
-
-		it('should return true on elements that have a role', function () {
-			var div = document.createElement('div');
-			div.setAttribute('role', 'button');
-			div.setAttribute('aria-cats', 'meow');
-			fixture.appendChild(div);
-
-			assert.isTrue(checks['aria-allowed-attr'].matches(div));
-		});
-
-		it('should return true on elements that have an implicit role', function () {
-			var div = document.createElement('a');
-			div.setAttribute('href', '#monkeys');
-			div.setAttribute('aria-cats', 'meow');
-			fixture.appendChild(div);
-
-			assert.isTrue(checks['aria-allowed-attr'].matches(div));
-		});
-	});
-
 });
\ No newline at end of file
diff --git a/test/checks/aria/valid-attr-value.js b/test/checks/aria/valid-attr-value.js
index 27ae8bd403..a375600de4 100644
--- a/test/checks/aria/valid-attr-value.js
+++ b/test/checks/aria/valid-attr-value.js
@@ -100,27 +100,7 @@ describe('aria-valid-attr-value', function () {
 			fixture.innerHTML = '<div id="target" aria-live="nope" aria-describedby="no exist k thx"></div>';
 			var target = fixture.querySelector('#target');
 			assert.isTrue(checks['aria-valid-attr-value'].evaluate.call(checkContext, target, ['aria-live', 'aria-describedby']));
-
-
-		});
-	});
-
-	describe('matches', function () {
-		it('should return false if an element has no attributes', function () {
-			var div = document.createElement('div');
-			assert.isFalse(checks['aria-valid-attr-value'].matches(div));
-		});
-		it('should return false if an element has no ARIA attributes', function () {
-			var div = document.createElement('div');
-			div.id = 'monkeys';
-			assert.isFalse(checks['aria-valid-attr-value'].matches(div));
 		});
-		it('should return true if an element has ARIA attributes', function () {
-			var div = document.createElement('div');
-			div.setAttribute('aria-bats', 'monkeys');
-			assert.isTrue(checks['aria-valid-attr-value'].matches(div));
-		});
-
 	});
 
 });
diff --git a/test/checks/aria/valid-attr.js b/test/checks/aria/valid-attr.js
index 285f41519c..63e36b7de8 100644
--- a/test/checks/aria/valid-attr.js
+++ b/test/checks/aria/valid-attr.js
@@ -71,22 +71,4 @@ describe('aria-valid-attr', function () {
 		});
 	});
 
-	describe('matches', function () {
-		it('should return false if an element has no attributes', function () {
-			var div = document.createElement('div');
-			assert.isFalse(checks['aria-valid-attr'].matches(div));
-		});
-		it('should return false if an element has no ARIA attributes', function () {
-			var div = document.createElement('div');
-			div.id = 'monkeys';
-			assert.isFalse(checks['aria-valid-attr'].matches(div));
-		});
-		it('should return true if an element has ARIA attributes', function () {
-			var div = document.createElement('div');
-			div.setAttribute('aria-bats', 'monkeys');
-			assert.isTrue(checks['aria-valid-attr'].matches(div));
-		});
-
-	});
-
 });
diff --git a/test/checks/color/color-contrast.js b/test/checks/color/color-contrast.js
index ea66e34edf..6388fc4696 100644
--- a/test/checks/color/color-contrast.js
+++ b/test/checks/color/color-contrast.js
@@ -103,7 +103,6 @@ describe('color-contrast', function () {
 		assert.deepEqual(checkContext._relatedNodes, [target]);
 	});
 
-
 	it('should ignore position:fixed elements above the target', function () {
 		fixture.innerHTML = '<div style="background-color: #e5f1e5;" id="background">' +
 			'<div style="width:100%; position:fixed; top:0; height:50px; background: #F0F0F0; z-index: 200; color:#fff" >header</div>' +
@@ -130,183 +129,4 @@ describe('color-contrast', function () {
 		assert.deepEqual(checkContext._relatedNodes, [target]);
 
 	});
-
-	describe('matches', function () {
-
-		it('should not match when there is no text', function () {
-			fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
-				' </div>';
-			var target = fixture.querySelector('#target');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should match when there is text', function () {
-			fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
-				'My text</div>';
-			var target = fixture.querySelector('#target');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match when there is text that is out of the container', function () {
-			fixture.innerHTML = '<div style="color: yellow; text-indent: -9999px; background-color: white;" id="target">' +
-				'My text</div>';
-			var target = fixture.querySelector('#target');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match when there is text that is out of the container with overflow hidden', function () {
-			fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: hidden; text-indent: 200px; background-color: white;" id="target">' +
-				'text</div>';
-			var target = fixture.querySelector('#target');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should match when there is text that is in the scroll reach of container', function () {
-			fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: scroll; text-indent: 200px; background-color: white;" id="target">' +
-				'text</div>';
-			var target = fixture.querySelector('#target');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should match when there is text that is only partially out of the container', function () {
-			fixture.innerHTML = '<div style="color: yellow; text-indent: -20px; background-color: white;" id="target">' +
-				'My text</div>';
-			var target = fixture.querySelector('#target');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should match <input type="text">', function () {
-			fixture.innerHTML = '<input type="text">';
-			var target = fixture.querySelector('input');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <input type="hidden">', function () {
-			fixture.innerHTML = '<input type="hidden">';
-			var target = fixture.querySelector('input');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <input type="checkbox">', function () {
-			fixture.innerHTML = '<input type="checkbox">';
-			var target = fixture.querySelector('input');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <input type="radio">', function () {
-			fixture.innerHTML = '<input type="radio">';
-			var target = fixture.querySelector('input');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <input type="color">', function () {
-			fixture.innerHTML = '<input type="color">';
-			var target = fixture.querySelector('input');
-			// Some browsers will fallback to type=text for unknown input types (looking at you IE)
-			if (target.type === 'color') {
-				assert.isFalse(checks['color-contrast'].matches(target));
-			}
-		});
-
-		it('should not match <input type="range">', function () {
-			fixture.innerHTML = '<input type="range">';
-			var target = fixture.querySelector('input');
-			// Some browsers will fallback to type=text for unknown input types (looking at you IE)
-			if (target.type === 'range') {
-				assert.isFalse(checks['color-contrast'].matches(target));
-			}
-		});
-
-		it('should match <select> with options', function () {
-			fixture.innerHTML = '<select><option>Hello</option></select>';
-			var target = fixture.querySelector('select');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <select> with no options', function () {
-			fixture.innerHTML = '<select></select>';
-			var target = fixture.querySelector('select');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should match <textarea>', function () {
-			fixture.innerHTML = '<textarea></textarea>';
-			var target = fixture.querySelector('textarea');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <option>', function () {
-			fixture.innerHTML = '<select><option>hi</option></select>';
-			var target = fixture.querySelector('option');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match inputs that are disabled', function () {
-			fixture.innerHTML = '<input type="text" disabled>';
-			var target = fixture.querySelector('input');
-			assert.isFalse(checks['color-contrast'].matches(target));
-
-		});
-
-		it('should not match <textarea disabled>', function () {
-			fixture.innerHTML = '<textarea disabled></textarea>';
-			var target = fixture.querySelector('textarea');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <select> with options', function () {
-			fixture.innerHTML = '<select disabled><option>Hello</option></select>';
-			var target = fixture.querySelector('select');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should match <button>', function () {
-			fixture.innerHTML = '<button>hi</button>';
-			var target = fixture.querySelector('button');
-			assert.isTrue(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <button disabled>', function () {
-			fixture.innerHTML = '<button disabled>hi</button>';
-			var target = fixture.querySelector('button');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match <input type=image>', function () {
-			fixture.innerHTML = '<input type="image">';
-			var target = fixture.querySelector('input');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match a disabled input\'s label - explicit label', function () {
-			fixture.innerHTML = '<label for="t1">Test</label><input type="text" id="t1" disabled>';
-			var target = fixture.querySelector('label');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match a disabled input\'s label - implicit label (input)', function () {
-			fixture.innerHTML = '<label>Test<input type="text" disabled></label>';
-			var target = fixture.querySelector('label');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match a disabled input\'s label - implicit label (textarea)', function () {
-			fixture.innerHTML = '<label>Test<textarea disabled>Hi</textarea></label>';
-			var target = fixture.querySelector('label');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match a disabled input\'s label - implicit label (select)', function () {
-			fixture.innerHTML = '<label>Test<select disabled><option>Test</option></select></label>';
-			var target = fixture.querySelector('label');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-
-		it('should not match a disabled input\'s label - aria-labelledby', function () {
-			fixture.innerHTML = '<div id="t1">Test</div><input type="text" aria-labelledby="bob t1 fred" disabled>';
-			var target = fixture.querySelector('div');
-			assert.isFalse(checks['color-contrast'].matches(target));
-		});
-	});
-
 });
diff --git a/test/checks/color/link-in-text-block.js b/test/checks/color/link-in-text-block.js
index 149a2ca964..8a8a12b06a 100644
--- a/test/checks/color/link-in-text-block.js
+++ b/test/checks/color/link-in-text-block.js
@@ -83,7 +83,7 @@ describe('link-in-text-block', function () {
 		}, {
 			color: '#000'
 		});
-		assert.isFalse(checks['link-in-text-block'].evaluate(linkElm));
+		assert.isTrue(checks['link-in-text-block'].evaluate(linkElm));
 	});
 
 	describe('link default state', function () {
@@ -140,13 +140,13 @@ describe('link-in-text-block', function () {
 			});
 		});
 
-		it('returns true if text contrast >= 3:0', function() {
+		it('returns undefined if text contrast >= 3:0', function() {
 			var linkElm = getLinkElm({
 				color: 'cyan'
 			}, {
 				color: 'black'
 			});
-			assert.isTrue(checks['link-in-text-block'].evaluate(linkElm));
+			assert.isUndefined(checks['link-in-text-block'].evaluate(linkElm));
 		});
 
 		it('returns false if text contrast < 3:0', function() {
@@ -158,29 +158,36 @@ describe('link-in-text-block', function () {
 			assert.isFalse(checks['link-in-text-block'].evaluate(linkElm));
 		});
 
-		it('returns true if background contrast >= 3:0', function() {
+		it('returns undefined if background contrast >= 3:0', function() {
 			var linkElm = getLinkElm({
+				color: '#000010',
 				backgroundColor: 'purple'
 			}, {
+				color: '#000000',
 				backgroundColor: 'white'
 			});
-			assert.isTrue(checks['link-in-text-block'].evaluate(linkElm));
+			assert.isUndefined(checks['link-in-text-block'].evaluate(linkElm));
 		});
 
 		it('returns false if background contrast < 3:0', function() {
 			var linkElm = getLinkElm({
+				color: '#000010',
 				backgroundColor: '#FFE'
 			}, {
+				color: '#000000',
 				backgroundColor: '#FFF'
 			});
 			assert.isFalse(checks['link-in-text-block'].evaluate(linkElm));
 		});
 
-		it('returns true if the background contrast can not be determined', function () {
+		it('returns undefined if the background contrast can not be determined', function () {
 			var linkElm = getLinkElm({ }, {
-				backgroundImage: 'url(photo.jpg)'
+				color: '#000010',
+				backgroundImage: 'url(data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7)'
+			}, {
+				color: '#000000'
 			});
-			assert.isTrue(checks['link-in-text-block'].evaluate(linkElm));
+			assert.isUndefined(checks['link-in-text-block'].evaluate(linkElm));
 		});
 
 	});
diff --git a/test/checks/navigation/landmark.js b/test/checks/navigation/landmark.js
index 4ee7f9f7e2..e2c2e94a0b 100644
--- a/test/checks/navigation/landmark.js
+++ b/test/checks/navigation/landmark.js
@@ -12,6 +12,11 @@ describe('landmark', function () {
 		assert.isTrue(checks.landmark.evaluate(fixture));
 	});
 
+	it('should return true when <main> is found', function () {
+		fixture.innerHTML = '<main></main>';
+		assert.isTrue(checks.landmark.evaluate(fixture));
+	});
+
 	it('should otherwise return false', function () {
 		fixture.innerHTML = '<div role="contentinfo"></div>';
 		assert.isFalse(checks.landmark.evaluate(fixture));
diff --git a/test/checks/navigation/region.js b/test/checks/navigation/region.js
index 39dc03b2ee..8bcad07f35 100644
--- a/test/checks/navigation/region.js
+++ b/test/checks/navigation/region.js
@@ -28,7 +28,7 @@ describe('region', function () {
 	});
 
 	it('should return false when img content is outside the region', function () {
-		fixture.innerHTML = '<div id="target"><img src="something.jpg"><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
+		fixture.innerHTML = '<div id="target"><img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7"><div role="main"><h1 id="mainheader" tabindex="0">Introduction</h1></div></div>';
 		var node = fixture.querySelector('#target');
 		assert.isFalse(checks.region.evaluate.call(checkContext, node));
 		assert.equal(checkContext._relatedNodes.length, 1);
diff --git a/test/checks/navigation/unique-frame-title-after.js b/test/checks/navigation/unique-frame-title-after.js
index 5e09a4fc09..d29987cde6 100644
--- a/test/checks/navigation/unique-frame-title-after.js
+++ b/test/checks/navigation/unique-frame-title-after.js
@@ -27,13 +27,20 @@ describe('unique-frame-title-after', function () {
 			}]);
 
 		assert.deepEqual(result, [{
-			data: 'bananas'
-		}, {
-			data: 'monkeys'
-		}, {
-			data: 'bananas'
-		}, {
-			data: 'monkeys'
+				data: 'bananas',
+				result: true
+			}, {
+				data: 'monkeys',
+				result: true
+			}, {
+				data: 'bananas',
+				result: true
+			}, {
+				data: 'apples',
+				result: false
+			}, {
+				data: 'monkeys',
+				result: true
 		}]);
 	});
 });
diff --git a/test/checks/navigation/unique-frame-title.js b/test/checks/navigation/unique-frame-title.js
index c0bf977d0d..50fa7e7309 100644
--- a/test/checks/navigation/unique-frame-title.js
+++ b/test/checks/navigation/unique-frame-title.js
@@ -19,4 +19,18 @@ describe('unique-frame-title', function () {
 		}));
 		assert.equal(checkContext._data, 'bananas');
 	});
+
+	it('should convert text to lower case', function () {
+		checks['unique-frame-title'].evaluate.call(checkContext, {
+			title: '\t  app\t \n \rle  '
+		});
+		assert.equal(checkContext._data, 'app le');
+	});
+
+	it('should take out space differences', function () {
+		checks['unique-frame-title'].evaluate.call(checkContext, {
+			title: 'APPLE'
+		});
+		assert.equal(checkContext._data, 'apple');
+	});
 });
diff --git a/test/checks/shared/non-empty-if-present.js b/test/checks/shared/non-empty-if-present.js
index 9f0a3f6f52..b67906f777 100644
--- a/test/checks/shared/non-empty-if-present.js
+++ b/test/checks/shared/non-empty-if-present.js
@@ -15,17 +15,18 @@ describe('non-empty-if-present', function () {
 		checkContext._data = null;
 	});
 
-	it('should return true if an value is present', function () {
+	it('should return false if a value is present', function () {
 		var node = document.createElement('input');
+		node.setAttribute('type', 'submit');
 		node.setAttribute('value', 'woohoo');
 		fixture.appendChild(node);
 
-		assert.isTrue(checks['non-empty-if-present'].evaluate.call(checkContext, node));
-		assert.equal(checkContext._data, 'woohoo');
+		assert.isFalse(checks['non-empty-if-present'].evaluate.call(checkContext, node));
 	});
 
-	it('should return true if an value is not present', function () {
+	it('should return true if a value is not present', function () {
 		var node = document.createElement('input');
+		node.setAttribute('type', 'submit');
 		fixture.appendChild(node);
 
 		assert.isTrue(checks['non-empty-if-present'].evaluate.call(checkContext, node));
@@ -34,6 +35,7 @@ describe('non-empty-if-present', function () {
 
 	it('should return false if an value is present, but empty', function () {
 		var node = document.createElement('input');
+		node.setAttribute('type', 'submit');
 		node.setAttribute('value', '');
 		fixture.appendChild(node);
 
@@ -41,13 +43,21 @@ describe('non-empty-if-present', function () {
 		assert.equal(checkContext._data, '');
 	});
 
-	it('should collapse whitespace', function () {
-		var node = document.createElement('div');
-		node.setAttribute('value', ' \t \n \r \t  \t\r\n ');
+	it('should return false if the element is not a submit or reset input', function () {
+		var node = document.createElement('input');
+		node.setAttribute('type', 'text');
 		fixture.appendChild(node);
+		assert.isFalse(checks['non-empty-if-present'].evaluate.call(checkContext, node));
 
+		node = document.createElement('input');
+		node.setAttribute('type', 'button');
+		fixture.appendChild(node);
 		assert.isFalse(checks['non-empty-if-present'].evaluate.call(checkContext, node));
-		assert.equal(checkContext._data, ' \t \n \r \t  \t\r\n ');
 
+		node = document.createElement('button');
+		node.setAttribute('type', 'submit');
+		fixture.appendChild(node);
+		assert.isFalse(checks['non-empty-if-present'].evaluate.call(checkContext, node));
 	});
+
 });
diff --git a/test/checks/tables/td-has-header.js b/test/checks/tables/td-has-header.js
index 8fd6805caf..94a12d8e5a 100644
--- a/test/checks/tables/td-has-header.js
+++ b/test/checks/tables/td-has-header.js
@@ -19,6 +19,38 @@ describe('td-has-header', function () {
 		checkContext._data = null;
 	});
 
+	it('should not be fooled by rowspan and colspan', function () {
+ 		fixture.innerHTML = '<table>' +
+  			'<thead>' +
+			'    <tr>' +
+			'      <td rowspan="2">Species</td>' +
+			'      <td colspan="2">Info</td>' +
+			'    </tr>' +
+			'    <tr>' +
+			'      <th>Name</th>' +
+			'      <th>Age</th>' +
+			'    </tr>' +
+			'  </thead>' +
+			'  <tbody>' +
+			'    <tr>' +
+			'      <td>Gorilla</td>' +
+			'      <td>Koko</td>' +
+			'      <td>44</td>' +
+			'    </tr>' +
+			'    <tr>' +
+			'      <td>Human</td>' +
+			'      <td>Matt</td>' +
+			'      <td>33</td>' +
+			'    </tr>' +
+			'  </tbody>' +
+			'</table>';
+		var node = fixture.querySelector('table');
+		var result = checks['td-has-header'].evaluate.call(checkContext, node);
+
+		assert.isFalse(result);
+		assert.equal(checkContext._relatedNodes.length, 4);
+	});
+
 	it('should return true each non-empty cell has a row header', function () {
 		fixture.innerHTML =
 			'<table>' +
diff --git a/test/commons/color/get-background-color.js b/test/commons/color/get-background-color.js
index f6457b74bc..4734a2ddc7 100644
--- a/test/commons/color/get-background-color.js
+++ b/test/commons/color/get-background-color.js
@@ -38,15 +38,12 @@ describe('color.getBackgroundColor', function () {
 		var bgNodes = [];
 		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
 		var expected = new axe.commons.color.Color(64, 64, 0, 1);
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			assert.closeTo(actual.red, expected.red, 0.5);
-			assert.closeTo(actual.green, expected.green, 0.5);
-			assert.closeTo(actual.blue, expected.blue, 0.5);
-			assert.closeTo(actual.alpha, expected.alpha, 0.1);
-			assert.deepEqual(bgNodes, [target, pos]);
-		} else {
-			assert.isNull(actual);
-		}
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+		assert.deepEqual(bgNodes, [target, pos]);
 	});
 
 	it('should do alpha blending from the back forward', function () {
@@ -83,15 +80,12 @@ describe('color.getBackgroundColor', function () {
 		var bgNodes = [];
 		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
 		var expected = new axe.commons.color.Color(64, 64, 0, 1);
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			assert.closeTo(actual.red, expected.red, 0.5);
-			assert.closeTo(actual.green, expected.green, 0.5);
-			assert.closeTo(actual.blue, expected.blue, 0.5);
-			assert.closeTo(actual.alpha, expected.alpha, 0.1);
-			assert.deepEqual(bgNodes, [target, under]);
-		} else {
-			assert.isNull(actual);
-		}
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+		assert.deepEqual(bgNodes, [target, under]);
 	});
 
 	it('should return the proper blended color if it has alpha set', function () {
@@ -139,19 +133,6 @@ describe('color.getBackgroundColor', function () {
 		assert.deepEqual(bgNodes, [target, parent]);
 	});
 
-	it('should return null if parent does not fully contain element', function () {
-		fixture.innerHTML = '<div style="background-color: white;">' +
-			'<div id="parent" style="height: 10px; width: 30px; background-color: #800000;">' +
-			'<div id="target" style="height: 20px; width: 15px; background-color: green; opacity: 0.5;">' +
-			'</div></div></div>';
-		var target = fixture.querySelector('#target');
-		var bgNodes = [];
-		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
-		assert.isNull(actual);
-		assert.deepEqual(bgNodes, [target]);
-	});
-
-
 	it('should return white if transparency goes all the way up to document', function () {
 		fixture.innerHTML = '<div id="target" style="height: 10px; width: 30px;">';
 		var target = fixture.querySelector('#target');
@@ -174,14 +155,24 @@ describe('color.getBackgroundColor', function () {
 		assert.deepEqual(bgNodes, [target]);
 	});
 
-	it('should return null if something is obscuring it', function () {
-		fixture.innerHTML = '<div style="position: absolute; top:0; left: 0; right: 0; bottom:0; background: #000"></div>' +
-			'<div id="target" style="position: relative; left: 1px;">Hello</div>';
+	it('should return null if something opaque is obscuring it', function () {
+		fixture.innerHTML = '<div style="width:100%; height: 100px; background: #000"></div>' +
+			'<div id="target" style="position: relative; top: -50px; z-index:-1;color:#fff;">Hello</div>';
 		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
 		assert.isNull(actual);
 
 	});
 
+	it('should return an actual if something non-opaque is obscuring it', function () {
+		fixture.innerHTML = '<div style="width:100%; height: 100px; background: rgba(0, 0, 0, 0.5)"></div>' +
+			'<div id="target" style="position: relative; top: -50px; z-index:-1;color:#fff;">Hello</div>';
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+		assert.isNotNull(actual);
+		assert.equal(Math.floor(actual.blue), 128);
+		assert.equal(Math.floor(actual.red), 128);
+		assert.equal(Math.floor(actual.green), 128);
+	});
+
 	it('should return the bgcolor if it is solid', function () {
 		fixture.innerHTML = '<div style="height: 40px; width: 30px; background-color: red;">' +
 			'<div id="target" style="height: 20px; width: 15px; background-color: green;">' +
@@ -198,16 +189,19 @@ describe('color.getBackgroundColor', function () {
 	});
 
 	it('should use hierarchical DOM traversal if possible', function () {
-		fixture.innerHTML = '<div id="parent" style="height: 40px; width: 30px; ' +
-			'background-color: white; position: relative; z-index: 5">' +
-			'<div id="target" style="height: 20px; width: 25px; z-index: 25;">' +
-			'</div></div>' +
-			'<div id="shifted" style="position: relative; top: -30px; height: 40px; width: 35px; ' +
-			'background-color: black; z-index: 15;"></div>';
+		fixture.innerHTML =
+		'<div id="parent" style="height: 40px; width: 30px; ' +
+		' background-color: white;">' +
+		'	<div id="target" style="height: 20px; width: 25px; z-index: 25; position:relative;">' +
+		'	</div>' +
+		'</div>' +
+		'<div id="shifted" style="position: relative; top: -10px; height: 40px; width: 35px; ' +
+		' background-color: black; z-index: 15;"></div>';
 		var target = fixture.querySelector('#target');
 		var parent = fixture.querySelector('#parent');
 		var bgNodes = [];
 		var actual = axe.commons.color.getBackgroundColor(target, bgNodes);
+
 		var expected = new axe.commons.color.Color(255, 255, 255, 1);
 		assert.closeTo(actual.red, expected.red, 0.5);
 		assert.closeTo(actual.green, expected.green, 0.5);
@@ -237,24 +231,23 @@ describe('color.getBackgroundColor', function () {
 	});
 
 	it('should use visual traversal when needed', function () {
-		fixture.innerHTML = '<div id="parent" style="height: 40px; width: 30px; ' +
-			'background-color: white; position: relative; z-index: 5">' +
-			'<div id="target" style="position: relative; top: 1px; height: 20px; width: 25px; z-index: 25;">' +
-			'</div>' +
-			'<div id="shifted" style="position: relative; top: -30px; height: 40px; width: 35px; ' +
-			'background-color: black; z-index: 15;"></div></div>';
+		fixture.innerHTML =
+		'<div id="parent" style="height: 40px; width: 30px; ' +
+		' background-color: white; position: relative; z-index: 5">' +
+		'	<div id="target" style="position: relative; top: 1px; height: 20px; width: 25px; z-index: 25;">' +
+		'	</div>' +
+		'<div id="shifted" style="position: relative; top: -30px; height: 40px; width: 35px; ' +
+		' background-color: black; z-index: 15;"></div></div>';
+
+
 		var target = fixture.querySelector('#target');
 		var shifted = fixture.querySelector('#shifted');
-		var parent = fixture.querySelector('#parent');
 		var bgNodes = [];
 		var actual = axe.commons.color.getBackgroundColor(target, bgNodes, false);
 		var expected = new axe.commons.color.Color(0, 0, 0, 1);
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			assert.deepEqual(bgNodes, [shifted]);
-		} else {
-			expected = new axe.commons.color.Color(255, 255, 255, 1);
-			assert.deepEqual(bgNodes, [parent]);
-		}
+
+		assert.deepEqual(bgNodes, [shifted]);
+
 		assert.closeTo(actual.red, expected.red, 0.5);
 		assert.closeTo(actual.green, expected.green, 0.5);
 		assert.closeTo(actual.blue, expected.blue, 0.5);
@@ -267,7 +260,7 @@ describe('color.getBackgroundColor', function () {
 		' background-color: white; position: relative; z-index: 5"> ' +
 		'	<div id="target" style="position: relative; top: 1px; height: 20px;' +
 		'	 width: 25px; z-index: 25; background:rgba(0,125,0,0.5);"></div> ' +
-		'	<div id="shifted" style="position: absolute; top: -30px; height: 40px; ' +
+		'	<div id="shifted" style="position: absolute; top: 0px; height: 40px; ' +
 		'    background-image: url(foobar.png);'+
 		'	 width: 35px; z-index: 15;">' +
 		'	</div>'+
@@ -324,4 +317,90 @@ describe('color.getBackgroundColor', function () {
 
 		assert.notEqual(window.pageYOffset, 0);
 	});
+
+	it('returns elements with negative z-index', function () {
+		fixture.innerHTML = '<div id="sibling" ' + 
+			'style="z-index:-1; position:absolute; width:100%; height:2em; background: #000"></div>' +
+			'<div id="target">Some text</div>';
+
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+
+		var expected = new axe.commons.color.Color(0, 0, 0, 1);
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+	});
+
+	it('returns negative z-index elements when body has a background', function () {
+		fixture.innerHTML = '<div id="sibling" ' + 
+			'style="z-index:-1; position:absolute; width:100%; height:2em; background: #000"></div>' +
+			'<div id="target">Some text</div>';
+
+		var orig = document.body.style.background;
+		document.body.style.background = '#FFF';
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+
+		var expected = new axe.commons.color.Color(0, 0, 0, 1);
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+
+		document.body.style.background = orig;
+	});
+
+	it('returns the body background', function () {
+		fixture.innerHTML = '<div id="target">elm</div>';
+		var orig = document.body.style.background;
+		document.body.style.background = '#F00';
+
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+		var expected = new axe.commons.color.Color(255, 0, 0, 1);
+		document.body.style.background = orig;
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+
+	});
+
+	it('returns the body background even when the body is MUCH larger than the screen', function () {
+		fixture.innerHTML = '<div id="target" style="height:20000px;">elm</div>';
+		var orig = document.body.style.background;
+		document.body.style.background = '#F00';
+
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+		var expected = new axe.commons.color.Color(255, 0, 0, 1);
+		document.body.style.background = orig;
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+
+	});
+
+
+
+	it('returns the html background', function () {
+		fixture.innerHTML = '<div id="target">elm</div>';
+		var orig = document.documentElement.style.background;
+		document.documentElement.style.background = '#0F0';
+
+		var actual = axe.commons.color.getBackgroundColor(document.getElementById('target'), []);
+		var expected = new axe.commons.color.Color(0, 255, 0, 1);
+		document.documentElement.style.background = orig;
+
+
+		assert.closeTo(actual.red, expected.red, 0.5);
+		assert.closeTo(actual.green, expected.green, 0.5);
+		assert.closeTo(actual.blue, expected.blue, 0.5);
+		assert.closeTo(actual.alpha, expected.alpha, 0.1);
+
+	});
+
 });
diff --git a/test/commons/dom/elements-from-point.js b/test/commons/dom/elements-from-point.js
deleted file mode 100644
index 02dcab2454..0000000000
--- a/test/commons/dom/elements-from-point.js
+++ /dev/null
@@ -1,98 +0,0 @@
-describe('dom.elementsFromPoint', function () {
-	'use strict';
-
-	var fixture = document.getElementById('fixture');
-
-	afterEach(function () {
-		document.getElementById('fixture').innerHTML = '';
-	});
-
-	it('should return positioned elements properly', function () {
-		fixture.innerHTML = '<div id="container" style="position: absolute; top: 0px; left: 0px; height: 100px; ' +
-			'width: 90px; background-color: rgba(0, 128, 0, 0.5);">' +
-			'<div id="pos" style="position: absolute; top: 50px; left: 40px; height: 40px; ' +
-			'width: 30px; background-color: rgba(0, 128, 0, 0.5);"></div>' +
-			'<div id="parent" style="position: absolute; top: 0px; left: 0px; height: 40px; ' +
-			'width: 30px; background-color: rgba(0, 128, 0, 0.5);">' +
-			'<div id="target" style="position: absolute; top: 60px; left: 45px; height: 20px; ' +
-			'width: 15px; background-color: rgba(0, 128, 0, 0.5);">' +
-			'</div></div></div>';
-		var target = fixture.querySelector('#target');
-		var pos = fixture.querySelector('#pos');
-		var container = fixture.querySelector('#container');
-
-		target.scrollIntoView();
-		var rect = target.getBoundingClientRect();
-
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			var visualParents = axe.commons.dom.elementsFromPoint(document,
-															Math.ceil(rect.left + 1),
-															Math.ceil(rect.top + 1));
-			assert.deepEqual(visualParents.slice(0, 3), [target, pos, container]);
-		}
-	});
-
-	it('should return inline elements properly', function () {
-		fixture.innerHTML = '<div id="container" style="position: absolute; top: 0px; left: 0px; height: 100px; ' +
-			'width: 90px; background-color: rgba(0, 128, 0, 0.5);">' +
-			'<span id="pos" style="position: absolute; top: 60px; left: 45px;' +
-			'background-color: rgba(0, 128, 0, 0.5);">Text goes here</span>' +
-			'<span id="parent" style="position: absolute; top: 0px; left: 0px;' +
-			'background-color: rgba(0, 128, 0, 0.5);">' +
-			'<span id="target" style="position: absolute; top: 60px; left: 45px;' +
-			'background-color: rgba(0, 128, 0, 0.5);">Text goes here' +
-			'</span></span></div>';
-		var target = fixture.querySelector('#target');
-		var pos = fixture.querySelector('#pos');
-		var container = fixture.querySelector('#container');
-
-		target.scrollIntoView();
-		var rect = target.getBoundingClientRect();
-
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			var visualParents = axe.commons.dom.elementsFromPoint(document,
-															Math.ceil(rect.left + 1),
-															Math.ceil(rect.top + 1));
-			assert.deepEqual(visualParents.slice(0, 3), [target, pos, container]);
-		}
-	});
-
-	it('should return normal flow elements properly', function () {
-		fixture.innerHTML = '<div id="parent" style="background-color: rgba(0, 128, 0, 0.5); height: 40px; width: 30px;">' +
-			'<div id="target" style="background-color: rgba(0, 128, 0, 0.5); height: 20px; width: 15px;">' +
-			'</div></div>';
-		var target = fixture.querySelector('#target');
-		var parent = fixture.querySelector('#parent');
-
-		target.scrollIntoView();
-		var rect = target.getBoundingClientRect();
-
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			var visualParents = axe.commons.dom.elementsFromPoint(document, Math.ceil(rect.left), Math.ceil(rect.top));
-			assert.deepEqual(visualParents.slice(0, 3), [target, parent, fixture]);
-		}
-	});
-
-	it('should use msElementsFromPoint if defined', function () {
-		fixture.innerHTML = '<div id="parent" style="height: 40px; width: 30px;">' +
-			'<div id="target" style="height: 20px; width: 15px;">' +
-			'</div></div>';
-		var target = fixture.querySelector('#target');
-
-		target.scrollIntoView();
-		var rect = target.getBoundingClientRect();
-		var visualParents = null;
-
-		if (axe.commons.dom.supportsElementsFromPoint(document)) {
-			if (!document.msElementsFromPoint) {
-				document.msElementsFromPoint = function () {
-					return ['a', 'b', 'c'];
-				};
-				visualParents = axe.commons.dom.elementsFromPoint(document, Math.ceil(rect.left), Math.ceil(rect.top));
-				delete document.msElementsFromPoint;
-				assert.deepEqual(visualParents.slice(0, 3), ['a', 'b', 'c']);
-			}
-		}
-	});
-
-});
diff --git a/test/commons/table/get-scope.js b/test/commons/table/get-scope.js
new file mode 100644
index 0000000000..adb12c0481
--- /dev/null
+++ b/test/commons/table/get-scope.js
@@ -0,0 +1,206 @@
+describe('table.getScope', function () {
+	'use strict';
+
+	function $id(id) {
+		return document.getElementById(id);
+	}
+
+	var fixture = $id('fixture');
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+
+	it('returns false for TD without scope attribute', function () {
+		fixture.innerHTML = '<table>' +
+			'<tr><td></td><td id="target">1</td></tr>' +
+			'<tr><th>2</th><td>ok</td></tr>' +
+			'</table>';
+
+		var target = $id('target');
+		assert.equal(axe.commons.table.getScope(target), false);
+	});
+
+	it('throws if it is not passed a data cell', function () {
+		assert.throws(function () {
+			axe.commons.table.getScope();
+		});
+
+		assert.throws(function () {
+			axe.commons.table.getScope(document.createElement('tr'));
+		});
+
+		assert.doesNotThrow(function () {
+			axe.commons.table.getScope(document.createElement('td'));
+		});
+	});
+
+
+	describe('auto scope', function () {
+		it('return `auto` with implicit row and col scope', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><th id="target">1</th><td>ok</td></tr>' +
+				'<tr><td>ok</td><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'auto');
+		});
+
+		it('return `auto` with implicit row and col scope, not in the first column', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><th id="target">1</th></tr>' +
+				'<tr><th>2</th><td>ok</td><td></td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'auto');
+		});
+
+		it('return `auto` with implicit row and col scope, not in the first row', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><th>1</th></tr>' +
+				'<tr><th id="target">2</th><td>ok</td><td></td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'auto');
+		});
+	});
+
+
+	describe('col scope', function () {
+		it('returns `col` with explicit col scope on TH', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><th id="target" scope="col">1</th></tr>' +
+				'<tr><th>2</th><td>ok</td><td></td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('returns `col` with explicit col scope on TD', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><td id="target" scope="col">1</td></tr>' +
+				'<tr><th>2</th><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('returns `col` with role = columnheader on TD', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><td id="target" scope="row" role="columnheader">1</td></tr>' +
+				'<tr><th>2</th><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('returns `col` when part of a row of all TH elements', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><th></th><th id="target">1</th></tr>' +
+				'<tr><td>2</td><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('returns `col` when part of both a row and a column of all TH elements', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><th id="target">1</th><th></th></tr>' +
+				'<tr><th>2</th><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('understands colspan on the table', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr> <th colspan="2"></th> </tr>' +
+				'<tr> <th id="target"></th> <th></th> </tr>' +
+				'<tr> <td></td> <td></td> </tr>' +
+				'</table>';
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+
+		it('understands colspan on the cell', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr> <th id="target" colspan="2"></th> </tr>' +
+				'<tr> <td></td> <td></td> </tr>' +
+				'</table>';
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'col');
+		});
+	});
+
+
+	describe('row scope', function () {
+		it('returns `row` with explicit row scope on TH', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><th>1</th></tr>' +
+				'<tr><th id="target" scope="row">2</th><td>ok</td><td></td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+
+		it('returns `row` with explicit row scope on TD', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><td>1</td></tr>' +
+				'<tr><td id="target" scope="row">2</td><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+
+		it('returns `row` with role = rowheader on TD', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><td></td><td>1</td></tr>' +
+				'<tr><td id="target" scope="col" role="rowheader">2</td><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+
+		it('returns `row` when part of a column of all TH elements', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr><th></th><td>1</td></tr>' +
+				'<tr><th id="target">2</th><td>ok</td></tr>' +
+				'</table>';
+
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+
+		it('understands rowspan in the table', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr> <th rowspan="2"></th> <th></th> <th></th> </tr>' +
+				'<tr> <th id="target"></th> <td></td> </tr>' +
+				'</table>';
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+
+		it('understands rowspan on the cell', function () {
+			fixture.innerHTML = '<table>' +
+				'<tr> <th></th> <th></th> </tr>' +
+				'<tr> <th id="target" rowspan="2"></th> <td></td> </tr>' +
+				'<tr> <td></td> </tr>' +
+				'</table>';
+			var target = $id('target');
+			assert.equal(axe.commons.table.getScope(target), 'row');
+		});
+	});
+
+});
diff --git a/test/commons/table/is-column-header.js b/test/commons/table/is-column-header.js
index d3544ee800..ab01e6b75b 100644
--- a/test/commons/table/is-column-header.js
+++ b/test/commons/table/is-column-header.js
@@ -1,78 +1,53 @@
 describe('table.isColumnHeader', function () {
 	'use strict';
-	function $id(id) {
-		return document.getElementById(id);
-	}
 
-	var fixture = $id('fixture');
-
-	afterEach(function () {
-		fixture.innerHTML = '';
+	var table, origGetScope;
+	beforeEach(function () {
+		table = axe.commons.table;
+		origGetScope = table.getScope;
 	});
 
-	it('should work with scope=auto', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td></td><th id="target">1</th></tr>' +
-			'<tr><th>2</th><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isTrue(axe.commons.table.isColumnHeader(target));
+	afterEach(function () {
+		table.getScope = origGetScope;
 	});
 
-	it('should work with scope=col', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td></td><th id="target" scope="col">1</th></tr>' +
-			'<tr><th>2</th><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
+	it('passes an argument to table.getScope', function () {
+		var called = false;
+		axe.commons.table.getScope = function (arg) {
+			assert.equal(arg, 'Buzz Lightyear');
+			called = true;
+			return 'auto';
+		};
+		axe.commons.table.isColumnHeader('Buzz Lightyear');
 
-		assert.isTrue(axe.commons.table.isColumnHeader(target));
+		assert.isTrue(called);
 	});
 
-	it('should work with scope=row', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td></td><th id="target" scope="row">1</th></tr>' +
-			'<tr><th>2</th><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isColumnHeader(target));
+	it('returns false if table.getScope returns false', function () {
+		table.getScope = function () {
+			return false;
+		};
+		assert.isFalse(table.isColumnHeader());
 	});
 
-	it('should work with scope=auto on TD', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td></td><td id="target">1</td></tr>' +
-			'<tr><th>2</th><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isColumnHeader(target));
+	it('returns true if table.getScope returns auto', function () {
+		table.getScope = function () {
+			return 'auto';
+		};
+		assert.isTrue(table.isColumnHeader());
 	});
 
-	it('should work with scope=col on TD', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td></td><td id="target" scope="col">1</td></tr>' +
-			'<tr><th>2</th><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isTrue(axe.commons.table.isColumnHeader(target));
+	it('returns true if table.getScope returns col', function () {
+		table.getScope = function () {
+			return 'col';
+		};
+		assert.isTrue(table.isColumnHeader());
 	});
 
-	it('should work with scope=auto with data cells in the same row', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><th id="target">1</th><td>ok</td></tr>' +
-			'<tr><td>ok</td><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isColumnHeader(target));
+	it('returns false if table.getScope returns row', function () {
+		table.getScope = function () {
+			return 'row';
+		};
+		assert.isFalse(table.isColumnHeader());
 	});
 });
diff --git a/test/commons/table/is-row-header.js b/test/commons/table/is-row-header.js
index 5c890ed5bd..f5c6c37424 100644
--- a/test/commons/table/is-row-header.js
+++ b/test/commons/table/is-row-header.js
@@ -1,75 +1,53 @@
 describe('table.isRowHeader', function () {
 	'use strict';
-	function $id(id) {
-		return document.getElementById(id);
-	}
 
-	var fixture = $id('fixture');
+	var table, origGetScope;
+	beforeEach(function () {
+		table = axe.commons.table;
+		origGetScope = table.getScope;
+	});
 
 	afterEach(function () {
-		fixture.innerHTML = '';
+		table.getScope = origGetScope;
 	});
 
-	it('should work with scope=auto', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><th id="target">2</th><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
+	it('passes an argument to table.getScope', function () {
+		var called = false;
+		table.getScope = function (arg) {
+			assert.equal(arg, 'Buzz Lightyear');
+			called = true;
+			return 'auto';
+		};
+		table.isRowHeader('Buzz Lightyear');
 
-		assert.isTrue(axe.commons.table.isRowHeader(target));
+		assert.isTrue(called);
 	});
 
-	it('should work with scope=row', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><th scope="row" id="target">2</th><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isTrue(axe.commons.table.isRowHeader(target));
+	it('returns false if table.getScope returns false', function () {
+		table.getScope = function () {
+			return false;
+		};
+		assert.isFalse(table.isRowHeader());
 	});
 
-	it('should work with scope=col', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><th id="target">2</th><th>ok</th><th></th></tr>' +
-			'<tr><td>2</td><td>ok</td><td></td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isRowHeader(target));
+	it('returns true if table.getScope returns auto', function () {
+		table.getScope = function () {
+			return 'auto';
+		};
+		assert.isTrue(table.isRowHeader());
 	});
 
-	it('should work with scope=auto on TD', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td id="target">2</td><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isRowHeader(target));
+	it('returns false if table.getScope returns col', function () {
+		table.getScope = function () {
+			return 'col';
+		};
+		assert.isFalse(table.isRowHeader());
 	});
 
-	it('should work with scope=row on TD', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><td scope="row" id="target">2</td><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isTrue(axe.commons.table.isRowHeader(target));
+	it('returns true if table.getScope returns row', function () {
+		table.getScope = function () {
+			return 'row';
+		};
+		assert.isTrue(table.isRowHeader());
 	});
-
-	it('should work with scope=auto with data cells in the same column', function () {
-		fixture.innerHTML = '<table>' +
-			'<tr><th id="target">1</th><td>ok</td></tr>' +
-			'<tr><td>ok</td><td>ok</td></tr>' +
-			'</table>';
-
-		var target = $id('target');
-
-		assert.isFalse(axe.commons.table.isRowHeader(target));
-	});
-
 });
diff --git a/test/commons/table/to-array.js b/test/commons/table/to-grid.js
similarity index 67%
rename from test/commons/table/to-array.js
rename to test/commons/table/to-grid.js
index 8904895546..a9840ca4a8 100644
--- a/test/commons/table/to-array.js
+++ b/test/commons/table/to-grid.js
@@ -1,4 +1,4 @@
-describe('table.toArray', function () {
+describe('table.toGrid', function () {
 	'use strict';
 	function $id(id) {
 		return document.getElementById(id);
@@ -18,7 +18,7 @@ describe('table.toArray', function () {
 
 		var target = fixture.querySelector('table');
 
-		assert.deepEqual(axe.commons.table.toArray(target), [
+		assert.deepEqual(axe.commons.table.toGrid(target), [
 			[$id('t1'), $id('t2')],
 			[$id('t3'), $id('t4')]
 		]);
@@ -32,7 +32,7 @@ describe('table.toArray', function () {
 
 		var target = fixture.querySelector('table');
 
-		assert.deepEqual(axe.commons.table.toArray(target), [
+		assert.deepEqual(axe.commons.table.toGrid(target), [
 			[$id('t1'), $id('t1'), $id('t2')],
 			[$id('t3'), $id('t3'), $id('t3')]
 		]);
@@ -41,15 +41,15 @@ describe('table.toArray', function () {
 	it('should have cells with height > 1 occupy more than one row', function () {
 
 		fixture.innerHTML = '<table>' +
-			'<tr><td id="t1" rowspan="2">2</td><td id="t2">ok</td></tr>' +
-			'<tr><td id="t3">ok</td></tr>' +
+			'<tr><td id="t1">2</td><td rowspan="2" id="t2">ok</td><td id="t3"></td></tr>' +
+			'<tr><td id="t4">4</td><td id="t5">5</td></tr>' +
 			'</table>';
 
 		var target = fixture.querySelector('table');
 
-		assert.deepEqual(axe.commons.table.toArray(target), [
-			[$id('t1'), $id('t2')],
-			[$id('t1'), $id('t3')]
+		assert.deepEqual(axe.commons.table.toGrid(target), [
+			[$id('t1'), $id('t2'), $id('t3')],
+			[$id('t4'), $id('t2'), $id('t5')]
 		]);
 	});
 
@@ -62,7 +62,7 @@ describe('table.toArray', function () {
 
 		var target = fixture.querySelector('table');
 
-		assert.deepEqual(axe.commons.table.toArray(target), [
+		assert.deepEqual(axe.commons.table.toGrid(target), [
 			[$id('t1'), $id('t1'), $id('t2')],
 			[$id('t1'), $id('t1'), $id('t3')]
 		]);
@@ -70,19 +70,17 @@ describe('table.toArray', function () {
 	});
 
 	it('should insert an empty array for empty rows', function () {
-			fixture.innerHTML = '<table>' +
-				'<tr></tr>' +
-				'<tr><td id="t1">ok</td></tr>' +
-				'</table>';
-
-			var target = fixture.querySelector('table');
-
-			assert.deepEqual(axe.commons.table.toArray(target), [
-				[],
-				[$id('t1')]
-			]);
+		fixture.innerHTML = '<table>' +
+			'<tr></tr>' +
+			'<tr><td id="t1">ok</td></tr>' +
+			'</table>';
 
+		var target = fixture.querySelector('table');
 
+		assert.deepEqual(axe.commons.table.toGrid(target), [
+			[],
+			[$id('t1')]
+		]);
 	});
 
 });
diff --git a/test/commons/table/traverse.js b/test/commons/table/traverse.js
new file mode 100644
index 0000000000..31035c2760
--- /dev/null
+++ b/test/commons/table/traverse.js
@@ -0,0 +1,131 @@
+/* global fixture */
+describe('table.traverse', function () {
+
+	var table, dummyTable, topRight, bottomLeft;
+	beforeEach(function () {
+		table = axe.commons.table;
+		dummyTable = [
+			['1a', '1b', '1c'],
+			['2a', '2b', '2c'],
+			['3a', '3b', '3c']
+		];
+		topRight = { x:0, y:0 };
+		bottomLeft = { x:2, y:2 };
+	});
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('traverses in the `right` direction', function () {
+		var iterations = 0;
+		var expect = ['1b', '1c'];
+
+		table.traverse({ x:1, y:0 }, topRight, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+		assert.equal(iterations, expect.length);
+	});
+
+
+	it('returns an array of traversed cells', function () {
+		var result = table.traverse({ x:1, y:0 }, topRight, dummyTable);
+		assert.deepEqual(result, ['1b', '1c']);
+	});
+
+	it('traverses in the `down` direction', function () {
+		var iterations = 0;
+		var expect = ['2a', '3a'];
+
+		table.traverse({ x:0, y:1 }, topRight, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+		assert.equal(iterations, expect.length);
+	});
+
+	it('traverses in the `left` direction', function () {
+		var iterations = 0;
+		var expect = ['3b', '3a'];
+
+		table.traverse({ x:-1, y:0 }, bottomLeft, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+		assert.equal(iterations, expect.length);
+	});
+
+	it('traverses in the `up` direction', function () {
+		var iterations = 0;
+		var expect = ['2c', '1c'];
+
+		table.traverse({ x:0, y:-1 }, bottomLeft, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+		assert.equal(iterations, expect.length);
+	});
+
+	it('takes string values as directions', function () {
+		var iterations = 0;
+		var expect = ['1b', '1c'];
+		table.traverse('right', topRight, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+
+		iterations = 0;
+		expect = ['2a', '3a'];
+		table.traverse('down', topRight, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+
+		iterations = 0;
+		expect = ['3b', '3a'];
+		table.traverse('left', bottomLeft, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+
+		iterations = 0;
+		expect = ['2c', '1c'];
+		table.traverse('up', bottomLeft, dummyTable,
+				function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+	});
+
+	it('stops when the callback returned true', function () {
+		var iterations = 0;
+		table.traverse({ x:1, y:1 }, topRight, dummyTable,
+				function (cell) {
+			assert.equal(cell, '2b'); // or not, to be?
+			iterations += 1;
+			return true;
+		});
+		assert.equal(iterations, 1);
+	});
+
+	it('starts at top-right of no position is given', function () {
+		var iterations = 0;
+		var expect = ['1b', '1c'];
+
+		table.traverse({ x:1, y:0 }, dummyTable, function (cell) {
+			assert.equal(cell, expect[iterations]);
+			iterations += 1;
+		});
+		assert.equal(iterations, expect.length);
+	});
+
+
+});
\ No newline at end of file
diff --git a/test/commons/text/accessible-text.js b/test/commons/text/accessible-text.js
index 381bce1ee2..504856ee1e 100644
--- a/test/commons/text/accessible-text.js
+++ b/test/commons/text/accessible-text.js
@@ -444,7 +444,9 @@ describe('text.accessibleText', function() {
 		it('should provide a default value for input type="reset"', function() {
 			fixture.innerHTML = '<input type="reset">';
 			var target = fixture.querySelector('input');
-			assert.equal(axe.commons.text.accessibleText(target), 'Reset');
+			var defaultText = axe.commons.text.accessibleText(target);
+			assert.isString(defaultText);
+			assert.notEqual(defaultText.trim(), '');
 		});
 
 		it('should find title for input type=button', function() {
diff --git a/test/core/base/audit.js b/test/core/base/audit.js
index e79fb05e82..a7b4b69141 100644
--- a/test/core/base/audit.js
+++ b/test/core/base/audit.js
@@ -2,8 +2,8 @@
 describe('Audit', function () {
 	'use strict';
 	var a;
-	var isNotCalled = function () {
-		assert.ok(false, 'Function should not be called');
+	var isNotCalled = function (err) {
+		throw err || new Error('Reject should not be called');
 	};
 	var noop = function () {};
 
@@ -218,11 +218,10 @@ describe('Audit', function () {
 			assert.equal(audit.checks.target, undefined);
 			audit.addCheck({
 				id: 'target',
-				selector: 'bob',
 				options: 'jane'
 			});
 			assert.ok(audit.checks.target);
-			assert.equal(audit.checks.target.selector, 'bob');
+			assert.equal(audit.checks.target.options, 'jane');
 			audit.resetRulesAndChecks();
 			assert.equal(audit.checks.target, undefined);
 		});
@@ -234,155 +233,119 @@ describe('Audit', function () {
 			assert.equal(audit.checks.target, undefined);
 			audit.addCheck({
 				id: 'target',
-				selector: 'bob',
 				options: 'jane'
 			});
 			assert.ok(audit.checks.target);
-			assert.equal(audit.checks.target.selector, 'bob');
+			assert.equal(audit.checks.target.options, 'jane');
 		});
 		it('should configure the metadata, if passed', function () {
 			var audit = new Audit();
 			assert.equal(audit.checks.target, undefined);
 			audit.addCheck({
 				id: 'target',
-				metadata: 'bob'
+				metadata: {guy:'bob'}
 			});
 			assert.ok(audit.checks.target);
-			assert.equal(audit.data.checks.target, 'bob');
+			assert.equal(audit.data.checks.target.guy, 'bob');
 		});
 		it('should reconfigure existing check', function () {
 			var audit = new Audit();
+			var myTest = function () {};
 			audit.addCheck({
 				id: 'target',
-				selector: 'bob',
-				options: 'jane'
+				evaluate: myTest,
+				options: 'jane',
 			});
-			assert.equal(audit.checks.target.selector, 'bob');
+
 			assert.equal(audit.checks.target.options, 'jane');
 
 			audit.addCheck({
 				id: 'target',
-				selector: 'fred'
+				options: 'fred'
 			});
 
-			assert.equal(audit.checks.target.selector, 'fred');
-			assert.equal(audit.checks.target.options, 'jane');
+			assert.equal(audit.checks.target.evaluate, myTest);
+			assert.equal(audit.checks.target.options, 'fred');
+		});
+		it('should not turn messages into a function', function () {
+			var audit = new Audit();
+			var spec = {
+				id: 'target',
+				evaluate: 'function () { return "blah";}',
+				metadata: {
+					messages: {
+						fail: 'it failed'
+					}
+				}
+			};
+			audit.addCheck(spec);
+
+			assert.equal(typeof audit.checks.target.evaluate, 'function');
+			assert.equal(typeof audit.data.checks.target.messages.fail, 'string');
+			assert.equal(audit.data.checks.target.messages.fail, 'it failed');
+		});
+
+		it('should turn function strings into a function', function () {
+			var audit = new Audit();
+			var spec = {
+				id: 'target',
+				evaluate: 'function () { return "blah";}',
+				metadata: {
+					messages: {
+						fail: 'function () {return "it failed";}'
+					}
+				}
+			};
+			audit.addCheck(spec);
+
+			assert.equal(typeof audit.checks.target.evaluate, 'function');
+			assert.equal(typeof audit.data.checks.target.messages.fail, 'function');
+			assert.equal(audit.data.checks.target.messages.fail(), 'it failed');
 		});
+
 	});
 
 	describe('Audit#run', function () {
 		it('should run all the rules', function (done) {
 			fixture.innerHTML = '<input aria-label="monkeys" type="text">' +
 				'<div id="monkeys">bananas</div>' +
-				'<input aria-labelledby="monkeys" type="text">' +
+				'<input aria-labelledby="monkeys">' +
 				'<blink>FAIL ME</blink>';
 
 			a.run({ include: [fixture] }, {}, function (results) {
 				var expected = [{
 					id: 'positive1',
-					result: 'NA',
+					result: 'inapplicable',
 					pageLevel: false,
 					impact: null,
-					nodes: [{
-						node: {
-							selector: ['#fixture > input:nth-of-type(1)'],
-							source: null
-						},
-						any: [{
-							id: 'positive1-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						none: []
-					}, {
-						node: {
-							selector: ['#fixture > input:nth-of-type(2)'],
-							source: '<input aria-labelledby="monkeys" type="text">'
-						},
-						any: [{
-							id: 'positive1-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						none: []
-					}]
+					nodes: '...other tests cover this...'
 				}, {
 					id: 'positive2',
-					result: 'NA',
+					result: 'inapplicable',
 					pageLevel: false,
 					impact: null,
-					nodes: [{
-						node: {
-							selector: ['#monkeys'],
-							source: '<div id="monkeys">bananas</div>'
-						},
-						any: [{
-							id: 'positive2-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						none: []
-					}]
+					nodes: '...other tests cover this...'
 				}, {
 					id: 'negative1',
-					result: 'NA',
+					result: 'inapplicable',
 					pageLevel: false,
 					impact: null,
-					nodes: [{
-						node: {
-							selector: ['#fixture'],
-							source: '<div id="fixture"><input aria-label="monkeys" type="text"><div id="monkeys">bananas</div><input aria-labelledby="monkeys" type="text"><blink>FAIL ME</blink></div>'
-						},
-						none: [{
-							id: 'negative1-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						any: []
-					}, {
-						node: {
-							selector: ['#monkeys'],
-							source: '<div id="monkeys">bananas</div>'
-						},
-						none: [{
-							id: 'negative1-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						any: []
-					}]
+					nodes: '...other tests cover this...'
 				}, {
 					id: 'positive3',
-					result: 'NA',
+					result: 'inapplicable',
 					pageLevel: false,
 					impact: null,
-					nodes: [{
-						node: {
-							selector: ['#fixture > blink'],
-							source: '<blink>FAIL ME</blink>'
-						},
-						any: [{
-							id: 'positive3-check1',
-							result: true,
-							data: null,
-							relatedNodes: []
-						}],
-						all: [],
-						none: []
-					}]
+					nodes: '...other tests cover this...'
 				}];
+
 				var out = results[0].nodes[0].node.source;
-				results[0].nodes[0].node.source = null;
+				results.forEach(function (res) {
+					// attribute order is a pain in the lower back in IE, so we're not
+					// comparing nodes. Check.run and Rule.run do this.
+					res.nodes = '...other tests cover this...';
+				});
+
 				assert.deepEqual(JSON.parse(JSON.stringify(results)), expected);
 				assert.match(out, /^<input(\s+type="text"|\s+aria-label="monkeys"){2,}>/);
 				done();
@@ -476,14 +439,7 @@ describe('Audit', function () {
 
 		});
 
-		it('should pass errors to axe.log', function (done) {
-			var orig = axe.log;
-			axe.log = function (err) {
-				assert.equal(err.message, 'Launch the super sheep!');
-				axe.log = orig;
-				done();
-			};
-
+		it('catches errors and passes them as a cantTell result', function (done) {
 			a.addRule({
 				id: 'throw1',
 				selector: '*',
@@ -497,12 +453,18 @@ describe('Audit', function () {
 					throw new Error('Launch the super sheep!');
 				}
 			});
+
 			a.run({ include: [fixture] }, {
 				runOnly: {
 					'type': 'rule',
 					'values': ['throw1']
 				}
-			}, noop, isNotCalled);
+			}, function (results) {
+				assert.lengthOf(results,1);
+				assert.equal(results[0].result, 'cantTell');
+				assert.equal(results[0].error.message, 'Launch the super sheep!');
+				done();
+			}, isNotCalled);
 		});
 
 		it('should not halt if errors occur', function (done) {
@@ -524,16 +486,25 @@ describe('Audit', function () {
 					'type': 'rule',
 					'values': ['throw1', 'positive1']
 				}
-			}, function (results) {
-				results = results.filter(function (result) {
-					return !!result;
-				});
-				assert.equal(results.length, 1);
-				assert.equal(results[0].id, 'positive1');
+			}, function () {
 				done();
 			}, isNotCalled);
 		});
 
+		it('should run audit.validateOptions to ensure valid input', function () {
+			fixture.innerHTML = '<input type="text" aria-label="monkeys">' +
+				'<div id="monkeys">bananas</div>' +
+				'<input aria-labelledby="monkeys" type="text">' +
+				'<blink>FAIL ME</blink>';
+			var checked = 'options not validated';
+
+			a.validateOptions = function () {
+				checked = 'options validated';
+			};
+
+			a.run({ include: [fixture] }, {}, noop, isNotCalled);
+			assert.equal(checked, 'options validated');
+		});
 		it('should halt if an error occurs when debug is set', function (done) {
 			a.addRule({
 				id: 'throw1',
@@ -559,7 +530,6 @@ describe('Audit', function () {
 				done();
 			});
 		});
-
 	});
 	describe('Audit#after', function () {
 		it('should run Rule#after on any rule whose result is passed in', function () {
@@ -586,4 +556,53 @@ describe('Audit', function () {
 		});
 	});
 
+	describe('Audit#validateOptions', function () {
+
+		it('returns the options object when it is valid', function () {
+			var opt = {
+				runOnly: {
+					type: 'rule',
+					value: ['positive1', 'positive2']
+				},
+				rules: {
+					negative1: { enabled: false }
+				}
+			};
+			assert(a.validateOptions(opt), opt);
+		});
+
+		it('throws an error when option.runOnly has an unknown rule', function () {
+			assert.throws(function () {
+				a.validateOptions({
+					runOnly: {
+						type: 'rule',
+						value: ['frakeRule']
+					}
+				});
+			});
+		});
+
+		it('throws an error when option.runOnly has an unknown tag', function () {
+			assert.throws(function () {
+				a.validateOptions({
+					runOnly: {
+						type: 'tags',
+						value: ['fakeTag']
+					}
+				});
+			});
+		});
+
+		it('throws an error when option.rules has an unknown rule', function () {
+			assert.throws(function () {
+				a.validateOptions({
+					rules: {
+						fakeRule: { enabled: false}
+					}
+				});
+			});
+		});
+
+	});
+
 });
diff --git a/test/core/base/check.js b/test/core/base/check.js
index b19396005c..916fa181a8 100644
--- a/test/core/base/check.js
+++ b/test/core/base/check.js
@@ -24,33 +24,6 @@ describe('Check', function () {
 				assert.isFalse(check.enabled);
 			});
 		});
-		describe('matches', function () {
-			it('should be a function', function () {
-				assert.isFunction(Check.prototype.matches);
-			});
-			it('should test its selector against a given node', function () {
-				var node = document.createElement('div');
-				node.id = 'monkeys';
-				fixture.appendChild(node);
-
-				var check = new Check({ selector: '#monkeys' });
-
-				assert.isTrue(check.matches(node));
-
-				node.id = 'bananas';
-				assert.isFalse(check.matches(node));
-
-			});
-
-			it('should default to true if selector is not set', function () {
-				var node = document.createElement('div');
-
-				var check = new Check({});
-
-				assert.isTrue(check.matches(node));
-
-			});
-		});
 
 		describe('configure', function () {
 			it('should accept one parameter', function () {
@@ -67,17 +40,6 @@ describe('Check', function () {
 				assert.equal('fong', check.test());
 				delete Check.prototype.test;
 			});
-			it('should override selector', function () {
-				Check.prototype.test = function () {
-					return this.selector;
-				};
-				var check = new Check({
-					selector: 'foo'
-				});
-				check.configure({selector: 'fong'});
-				assert.equal('fong', check.test());
-				delete Check.prototype.test;
-			});
 			it('should override evaluate', function () {
 				Check.prototype.test = function () {
 					return this.evaluate();
@@ -89,17 +51,6 @@ describe('Check', function () {
 				assert.equal('fong', check.test());
 				delete Check.prototype.test;
 			});
-			it('should override matches', function () {
-				Check.prototype.test = function () {
-					return this.matches();
-				};
-				var check = new Check({
-					matches: 'function () { return "foo"; }'
-				});
-				check.configure({matches: 'function () { return "fong"; }'});
-				assert.equal('fong', check.test());
-				delete Check.prototype.test;
-			});
 			it('should override after', function () {
 				Check.prototype.test = function () {
 					return this.after();
@@ -122,17 +73,6 @@ describe('Check', function () {
 				assert.equal('fong', check.test());
 				delete Check.prototype.test;
 			});
-			it('should override matches as a function', function () {
-				Check.prototype.test = function () {
-					return this.matches();
-				};
-				var check = new Check({
-					matches: function () { return 'foo'; }
-				});
-				check.configure({matches: function () { return 'fong'; }});
-				assert.equal('fong', check.test());
-				delete Check.prototype.test;
-			});
 			it('should override after as a function', function () {
 				Check.prototype.test = function () {
 					return this.after();
@@ -182,22 +122,6 @@ describe('Check', function () {
 				assert.lengthOf(new Check({}).run, 4);
 			});
 
-			it('should call matches', function (done) {
-				var success = false;
-
-				new Check({
-					matches: function () {
-						success = true;
-						return true;
-					},
-					evaluate: function () {
-						assert.isTrue(success);
-						done();
-					}
-				}).run(fixture, {}, noop);
-
-			});
-
 			it('should pass the node through', function (done) {
 				new Check({
 					evaluate: function (node) {
@@ -273,23 +197,10 @@ describe('Check', function () {
 					done();
 				});
 
-			});
-
-			it('should pass `null` as the parameter if the node does not match', function (done) {
-
-				new Check({
-					selector: '#monkeys',
-					evaluate: function () {}
-				}).run(fixture, {}, function (data) {
-					assert.isNull(data);
-					done();
-				});
-
 			});
 			it('should pass `null` as the parameter if not enabled', function (done) {
 
 				new Check({
-					selector: '#monkeys',
 					evaluate: function () {},
 					enabled: false
 				}).run(fixture, {}, function (data) {
@@ -301,7 +212,6 @@ describe('Check', function () {
 			it('should pass `null` as the parameter if options disable', function (done) {
 
 				new Check({
-					selector: '#monkeys',
 					evaluate: function () {}
 				}).run(fixture, {enabled: false}, function (data) {
 					assert.isNull(data);
@@ -342,28 +252,6 @@ describe('Check', function () {
 
 	describe('spec object', function () {
 
-		describe('.matches', function () {
-			it('should be set', function () {
-				var spec = {
-					matches: function () {}
-				};
-				assert.equal(new Check(spec).matches, spec.matches);
-			});
-
-			it('should default to prototype', function () {
-				var spec = {};
-				assert.equal(new Check(spec).matches, Check.prototype.matches);
-			});
-
-			it('should be able to take a string and turn it into a function', function () {
-				var spec = {
-					matches: 'function () {return "blah";}'
-				};
-				assert.equal(typeof new Check(spec).matches, 'function');
-				assert.equal(new Check(spec).matches(), 'blah');
-			});
-		});
-
 		describe('.id', function () {
 			it('should be set', function () {
 				var spec = {
diff --git a/test/core/base/context.js b/test/core/base/context.js
index 6eef4a0abf..ac755e655f 100644
--- a/test/core/base/context.js
+++ b/test/core/base/context.js
@@ -282,6 +282,48 @@ describe('Context', function() {
 
 		});
 
+		describe('throwing errors', function () {
+			// jshint unused:false
+			var isInFrame;
+
+			beforeEach(function () {
+				isInFrame = axe.utils.respondable.isInFrame;
+			});
+			afterEach(function () {
+				axe.utils.respondable.isInFrame = isInFrame;
+			});
+
+			it('should throw when no elements match the context', function () {
+				fixture.innerHTML = '<div id="foo"></div>';
+				assert.throws(function () {
+					var ctxt = new Context('#notAnElement');
+				}, Error, 'No elements found for include in page Context');
+			});
+
+			it('should throw when no elements match the context inside a frame', function () {
+				axe.utils.respondable.isInFrame = function () {
+					return true;
+				};
+
+				fixture.innerHTML = '<div id="foo"></div>';
+				assert.throws(function () {
+					var ctxt = new Context('#notAnElement');
+				}, Error, 'No elements found for include in frame Context');
+			});
+		});
+
+		it('should throw when frame could not be found', function (done) {
+			fixture.innerHTML = '<div id="outer"></div>';
+			iframeReady('../mock/frames/context.html', $id('outer'), 'target', function() {
+				assert.throws(function () {
+					var ctxt;
+					ctxt = new Context(['#notAFrame', '#foo']);
+				});
+				done();
+			});
+
+		});
+
 	});
 
 	describe('object definition', function() {
@@ -302,10 +344,10 @@ describe('Context', function() {
 		it('should disregard bad input, non-matching selectors', function() {
 
 			assert.deepEqual(new Context({
-				include: ['#monkeys'],
+				include: ['#fixture', '#monkeys'],
 				exclude: ['#bananas']
 			}), {
-				include: [],
+				include: [document.getElementById('fixture')],
 				exclude: [],
 				initiator: true,
 				page: false,
diff --git a/test/core/base/rule.js b/test/core/base/rule.js
index d5aa899c26..31d5cfa787 100644
--- a/test/core/base/rule.js
+++ b/test/core/base/rule.js
@@ -4,8 +4,8 @@ describe('Rule', function() {
 
 	var fixture = document.getElementById('fixture');
 	var noop = function () {};
-	var isNotCalled = function () {
-		assert.ok(false, 'Function should not be called');
+	var isNotCalled = function (err) {
+		throw err || new Error('Reject should not be called');
 	};
 
 	afterEach(function() {
@@ -342,9 +342,6 @@ describe('Rule', function() {
 								enabled: true,
 								evaluate: function() {
 									return true;
-								},
-								matches: function() {
-									return true;
 								}
 							})
 						}
@@ -365,33 +362,7 @@ describe('Rule', function() {
 							cats: new Check({
 								id: 'cats',
 								enabled: false,
-								evaluate: function() {},
-								matches: function() {
-									return true;
-								}
-							})
-						}
-					});
-					rule.run({
-						include: [fixture]
-					}, {}, function() {
-						assert.isFalse(isDqElementCalled);
-						done();
-					}, isNotCalled);
-				});
-
-				it('is not created for un-matching nodes', function(done) {
-					var rule = new Rule({
-						all: ['cats']
-					}, {
-						checks: {
-							cats: new Check({
-								id: 'cats',
-								enabled: true,
-								evaluate: function() {},
-								matches: function() {
-									return false;
-								}
+								evaluate: function() {}
 							})
 						}
 					});
diff --git a/test/core/constants.js b/test/core/constants.js
index f01c9393dd..3231d12f89 100644
--- a/test/core/constants.js
+++ b/test/core/constants.js
@@ -4,22 +4,33 @@ describe('axe.constants', function () {
 	it('should create an object', function () {
 		assert.isObject(axe.constants);
 	});
-	describe('ruleResult', function () {
 
-		it('should be an object', function () {
-			assert.isObject(axe.constants.result);
-		});
+	it('should have a results array', function () {
+		assert.isArray(axe.constants.results);
+	});
+
+	it('should have PASS', function () {
+		assert.equal(axe.constants.PASS, 'passed');
+	});
+
+	it('should have FAIL', function () {
+		assert.equal(axe.constants.FAIL, 'failed');
+	});
 
-		it('should have PASS', function () {
-			assert.equal(axe.constants.result.PASS, 'PASS');
-		});
+	it('should have NA', function () {
+		assert.equal(axe.constants.NA, 'inapplicable');
+	});
 
-		it('should have FAIL', function () {
-			assert.equal(axe.constants.result.FAIL, 'FAIL');
-		});
+	it('should have CANTTELL', function () {
+		assert.equal(axe.constants.CANTTELL, 'cantTell');
+	});
 
-		it('should have NA', function () {
-			assert.equal(axe.constants.result.NA, 'NA');
-		});
+	it('should have priorities for results', function () {
+		assert.equal(axe.constants.NA_PRIO, 0);
 	});
+
+	it('should have groups for results', function () {
+		assert.equal(axe.constants.FAIL_GROUP, 'violations');
+	});
+
 });
diff --git a/test/core/public/a11y-check.js b/test/core/public/a11y-check.js
new file mode 100644
index 0000000000..258245664c
--- /dev/null
+++ b/test/core/public/a11y-check.js
@@ -0,0 +1,69 @@
+describe('axe.a11yCheck', function () {
+	'use strict';
+
+	describe('reporter', function () {
+		var origReporters;
+		var noop = function () {};
+
+		beforeEach(function () {
+			axe._load({});
+			origReporters = window.reporters;
+		});
+
+		afterEach(function () {
+			window.reporters = origReporters;
+		});
+
+		it('should throw if no audit is configured', function () {
+			axe._audit = null;
+
+			assert.throws(function () {
+				axe.a11yCheck(document, {});
+			}, Error, /^No audit configured/);
+		});
+
+		it('should allow for option-less invocation', function (done) {
+			axe.a11yCheck(document, function (result) {
+				assert.isObject(result);
+				done();
+			});
+		});
+
+		it('sets v2 as the default reporter if audit.reporter is null', function (done) {
+			var origRunRules = axe._runRules;
+
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'v2');
+				axe._runRules = origRunRules;
+				done();
+			};
+
+			axe._audit.reporter = null;
+			axe.a11yCheck(document, noop);
+		});
+
+		it('uses the audit.reporter if no reporter is set in options', function (done) {
+			var origRunRules = axe._runRules;
+
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'raw');
+				axe._runRules = origRunRules;
+				done();
+			};
+			axe._audit.reporter = 'raw';
+			axe.a11yCheck(document, noop);
+		});
+
+		it('does not override if another reporter is set', function (done) {
+			var origRunRules = axe._runRules;
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'raw');
+				axe._runRules = origRunRules;
+				done();
+			};
+			axe._audit.reporter = null;
+			axe.a11yCheck(document, {reporter: 'raw'}, noop);
+		});
+
+	});
+});
\ No newline at end of file
diff --git a/test/core/public/configure.js b/test/core/public/configure.js
index a31aa3c312..40e6da7cd1 100644
--- a/test/core/public/configure.js
+++ b/test/core/public/configure.js
@@ -18,7 +18,9 @@ describe('axe.configure', function() {
 	});
 
 	it('should override an audit\'s reporter - string', function() {
-		axe._load({ reporter: function (results, callback) { callback(results); } });
+		axe._load({ });
+		assert.isNull(axe._audit.reporter);
+
 		axe.configure({ reporter: 'v1' });
 		assert.equal(axe._audit.reporter, 'v1');
 	});
@@ -68,6 +70,25 @@ describe('axe.configure', function() {
 			'https://dequeuniversity.com/rules/thung/x.y/bob?application=thing');
 	});
 
+	it('sets branding on newly configured rules', function () {
+		axe._load({});
+		axe.configure({
+			branding: {
+				application: 'thing',
+				brand: 'thung'
+			}
+		});
+		axe.configure({
+			rules: [{
+				id: 'bob',
+				selector: 'pass',
+			}],
+		});
+
+		assert.equal(axe._audit.data.rules.bob.helpUrl,
+			'https://dequeuniversity.com/rules/thung/x.y/bob?application=thing');
+	});
+
 	it('should allow for overwriting of rules', function () {
 		axe._load({
 			data: {
@@ -84,7 +105,9 @@ describe('axe.configure', function() {
 			rules: [{
 				id: 'bob',
 				selector: 'pass',
-				metadata: {joe: 'joe'}
+				metadata: {
+					joe: 'joe'
+				}
 			}]
 		});
 
@@ -101,14 +124,16 @@ describe('axe.configure', function() {
 			checks: [{
 				id: 'bob',
 				options: true,
-				metadata: 'joe'
+				metadata: {
+					joe: 'joe'
+				}
 			}]
 		});
 
 		assert.instanceOf(axe._audit.checks.bob, Check);
 		assert.equal(axe._audit.checks.bob.id, 'bob');
 		assert.isTrue(axe._audit.checks.bob.options);
-		assert.equal(axe._audit.data.checks.bob, 'joe');
+		assert.equal(axe._audit.data.checks.bob.joe, 'joe');
 
 	});
 
@@ -122,23 +147,52 @@ describe('axe.configure', function() {
 			checks: [{
 				id: 'bob',
 				options: false,
-				selector: 'fail'
 			}]
 		});
 		axe.configure({
 			checks: [{
 				id: 'bob',
 				options: true,
-				selector: 'pass',
-				metadata: 'joe'
+				metadata: {
+					joe: 'joe'
+				}
 			}]
 		});
 
 		assert.instanceOf(axe._audit.checks.bob, Check);
 		assert.equal(axe._audit.checks.bob.id, 'bob');
 		assert.isTrue(axe._audit.checks.bob.options);
-		assert.equal(axe._audit.checks.bob.selector, 'pass');
-		assert.equal(axe._audit.data.checks.bob, 'joe');
+		assert.equal(axe._audit.data.checks.bob.joe, 'joe');
 
 	});
+
+	it('should create an execution context for check messages', function () {
+		axe._load({});
+		axe.configure({
+			checks: [{
+				id: 'bob',
+				metadata: {
+					messages: {
+						pass: 'function () { return \'Bob\' + \' John\';}',
+						fail: 'Bob Pete'
+					}
+				}
+			}]
+		});
+
+		assert.isFunction(axe._audit.data.checks.bob.messages.pass);
+		assert.isString(axe._audit.data.checks.bob.messages.fail);
+		assert.equal(axe._audit.data.checks.bob.messages.pass(), 'Bob John');
+		assert.equal(axe._audit.data.checks.bob.messages.fail, 'Bob Pete');
+	});
+
+	it('overrides the default value of audit.tagExclude', function () {
+		axe._load({});
+		assert.deepEqual(axe._audit.tagExclude, ['experimental']);
+
+		axe.configure({
+			tagExclude: ['ninjas']
+		});
+		assert.deepEqual(axe._audit.tagExclude, ['ninjas']);
+	});
 });
diff --git a/test/core/public/reporter.js b/test/core/public/reporter.js
index c96c8034c2..83936c3014 100644
--- a/test/core/public/reporter.js
+++ b/test/core/public/reporter.js
@@ -1,9 +1,8 @@
-describe('axe.reporter', function () {
+describe('axe.addReporter', function () {
 	'use strict';
 
 	var orig = {};
 	before(function () {
-		orig.defaultReporter = window.defaultReporter;
 		orig.reporters = window.reporters;
 	});
 
@@ -14,22 +13,8 @@ describe('axe.reporter', function () {
 	});
 
 	it('should add reporter with given name', function () {
-		axe.reporter('bob', 'joe');
+		axe.addReporter('bob', 'joe');
 		assert.equal(window.reporters.bob, 'joe');
 	});
 
-	describe('defaultReporter', function () {
-
-		it('should add set defaultReporter if true', function () {
-			axe.reporter('bob', 'joe', true);
-			assert.equal(window.reporters.bob, 'joe');
-			assert.equal(window.defaultReporter, 'joe');
-		});
-
-		it('should clobber any previous default reporter', function () {
-			axe.reporter('bob', 'joe', true);
-			axe.reporter('sally', 'sue', true);
-			assert.equal(window.defaultReporter, 'sue');
-		});
-	});
 });
diff --git a/test/core/public/reset.js b/test/core/public/reset.js
index 900b173de8..eb69def51e 100644
--- a/test/core/public/reset.js
+++ b/test/core/public/reset.js
@@ -20,33 +20,49 @@ describe('axe.reset', function () {
 	it('should restore the default configuration', function () {
 		axe._load({
 			data: {
-				rules: [{
-					bob: 'not-joe'
-				}]
+				rules: {
+					bob: {
+						'knows': 'not-joe'
+					}
+				}
 			},
 			rules: [{
 				id: 'bob',
 				selector: 'fail'
-			}]
+			}],
+			reporter: 'v2'
 		});
 		assert.lengthOf(axe._audit.rules, 1);
 		assert.instanceOf(axe._audit.rules[0], Rule);
 		assert.equal(axe._audit.rules[0].id, 'bob');
 		assert.equal(axe._audit.rules[0].selector, 'fail');
+		assert.equal(axe._audit.reporter, 'v2');
+
 		axe.configure({
 			rules: [{
 				id: 'bob',
 				selector: 'pass',
-			}]
+				metadata: {
+					knows: 'joe'
+				}
+			}],
+			reporter: 'raw'
 		});
 		assert.lengthOf(axe._audit.rules, 1);
 		assert.instanceOf(axe._audit.rules[0], Rule);
 		assert.equal(axe._audit.rules[0].id, 'bob');
 		assert.equal(axe._audit.rules[0].selector, 'pass');
+		assert.equal(axe._audit.reporter, 'raw');
+		assert.equal(axe._audit.data.rules.bob.knows, 'joe');
+
 		axe.reset();
+
 		assert.lengthOf(axe._audit.rules, 1);
 		assert.instanceOf(axe._audit.rules[0], Rule);
 		assert.equal(axe._audit.rules[0].id, 'bob');
 		assert.equal(axe._audit.rules[0].selector, 'fail');
+		assert.equal(axe._audit.reporter, 'v2');
+		assert.equal(axe._audit.data.rules.bob.knows, 'not-joe');
 	});
+
 });
diff --git a/test/core/public/run-rules.js b/test/core/public/run-rules.js
index 0fc4ddaeab..6dc83cb299 100644
--- a/test/core/public/run-rules.js
+++ b/test/core/public/run-rules.js
@@ -1,86 +1,4 @@
 /*global runRules */
-describe('axe.a11yCheck', function () {
-	'use strict';
-
-	describe('reporter', function () {
-
-		it('should throw if no audit is configured', function () {
-			axe._audit = null;
-
-			assert.throws(function () {
-				axe.a11yCheck(document, {});
-			}, Error, /^No audit configured/);
-		});
-
-		it('should allow for option-less invocation', function (done) {
-
-			axe._load({ reporter: function (r, c) {
-				c(r);
-			}});
-			axe.a11yCheck(document, function (result) {
-				assert.isArray(result);
-				assert.lengthOf(result, 0);
-				done();
-			});
-		});
-
-		it('should use specified reporter via options - anon function', function (done) {
-
-			axe._load({
-				reporter: function () {
-					assert.fail('should not be called');
-				}
-			});
-			axe.a11yCheck(document, { reporter: function (result) {
-				assert.isArray(result);
-				assert.lengthOf(result, 0);
-				done();
-			}});
-		});
-
-		it('should use specified reporter via options by name', function (done) {
-
-			var orig = window.reporters;
-			axe._load({
-				reporter: function () {
-					assert.fail('should not be called');
-				}
-			});
-			axe.reporter('foo', function (result) {
-				assert.isArray(result);
-				assert.lengthOf(result, 0);
-				window.reporters = orig;
-				done();
-			});
-			axe.a11yCheck(document, { reporter: 'foo' });
-		});
-
-		it('should check configured reporter', function (done) {
-
-			axe._load({
-				reporter: function (result) {
-					assert.isArray(result);
-					assert.lengthOf(result, 0);
-					done();
-				}
-			});
-			axe.a11yCheck(document, null);
-		});
-
-		it('fallback to default configured reporter', function (done) {
-			var orig = window.defaultReporter;
-			window.defaultReporter = function (result) {
-				assert.isArray(result);
-				assert.lengthOf(result, 0);
-				done();
-			};
-
-			axe._load({});
-			axe.a11yCheck(document, null);
-			window.defaultReporter = orig;
-		});
-	});
-});
 describe('runRules', function () {
 	'use strict';
 
@@ -94,9 +12,14 @@ describe('runRules', function () {
 		context.appendChild(i);
 	}
 
-	function createFrames(callback) {
-		var frame, num = 2,
-			loaded = 0;
+	function createFrames(url, callback) {
+		var frame, num = 2;
+		var loaded = 0;
+
+		if (typeof url === 'function'){
+			callback = url;
+			url = '../mock/frames/frame-frame.html';
+		}
 
 		function onLoad() {
 			loaded++;
@@ -106,7 +29,7 @@ describe('runRules', function () {
 		}
 
 		frame = document.createElement('iframe');
-		frame.src = '../mock/frames/frame-frame.html';
+		frame.src = url;
 
 		frame.addEventListener('load', onLoad);
 		fixture.appendChild(frame);
@@ -115,14 +38,15 @@ describe('runRules', function () {
 		frame.src = '../mock/frames/nocode.html';
 		frame.addEventListener('load', onLoad);
 		fixture.appendChild(frame);
+		return frame;
 	}
 
 	var fixture = document.getElementById('fixture');
 
 	var isNotCalled;
 	beforeEach(function () {
-		isNotCalled = function () {
-			assert.ok(false, 'Reject should not be called');
+		isNotCalled = function (err) {
+			throw err || new Error('Reject should not be called');
 		};
 	});
 
@@ -203,7 +127,7 @@ describe('runRules', function () {
 				any: ['has-target']
 			}, {
 				id: 'first-div',
-				selector: 'div',
+				selector: 'div:not([id=fixture])',
 				any: ['first-div']
 			}],
 			checks: [{
@@ -213,7 +137,6 @@ describe('runRules', function () {
 				}
 			}, {
 				id: 'first-div',
-				selector: ':not(#fixture)',
 				evaluate: function (node) {
 					this.relatedNodes([node]);
 					return false;
@@ -238,10 +161,15 @@ describe('runRules', function () {
 					helpUrl: 'https://dequeuniversity.com/rules/axe/x.y/div#target?application=axeAPI',
 					pageLevel: false,
 					impact: null,
+					inapplicable: [],
+					incomplete: [],
 					violations: [],
 					passes: [{
+						result: 'passed',
+						impact: null,
 						node: {
 							selector: ['#context-test', '#target'],
+							xpath: ['/iframe[@id=\'context-test\']', '/div[@id=\'target\']'],
 							source: '<div id="target"></div>'
 						},
 						any: [{
@@ -252,17 +180,22 @@ describe('runRules', function () {
 						all: [],
 						none: []
 					}],
-					result: 'PASS',
+					result: 'passed',
 					tags: []
 				}, {
 					id: 'first-div',
 					helpUrl: 'https://dequeuniversity.com/rules/axe/x.y/first-div?application=axeAPI',
 					pageLevel: false,
 					impact: null,
+					inapplicable: [],
+					incomplete: [],
 					violations: [],
 					passes: [{
+						result: 'passed',
+						impact: null,
 						node: {
 							selector: ['#context-test', '#foo'],
+							xpath: ['/iframe[@id=\'context-test\']', '/div[@id=\'foo\']'],
 							source: '<div id="foo">\n		<div id="bar"></div>\n	</div>'
 						},
 						any: [{
@@ -270,13 +203,14 @@ describe('runRules', function () {
 							data: null,
 							relatedNodes: [{
 								selector: ['#context-test', '#foo'],
+								xpath: ['/iframe[@id=\'context-test\']', '/div[@id=\'foo\']'],
 								source: '<div id="foo">\n		<div id="bar"></div>\n	</div>'
 							}]
 						}],
 						all: [],
 						none: []
 					}],
-					result: 'PASS',
+					result: 'passed',
 					tags: []
 				}]);
 
@@ -309,7 +243,8 @@ describe('runRules', function () {
 			length: 2
 		};
 
-		axe.a11yCheck($test, function (results) {
+		axe.run($test, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 1);
 			assert.lengthOf(results.violations[0].nodes, 4);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['#t1']);
@@ -338,7 +273,8 @@ describe('runRules', function () {
 		fixture.innerHTML = '<div class="foo" id="t1"><span></span></div><div class="foo" id="t2"><em></em></div>';
 
 		var test = fixture.querySelectorAll('.foo');
-		axe.a11yCheck(test, function (results) {
+		axe.run(test, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 1);
 			assert.lengthOf(results.violations[0].nodes, 4);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['#t1']);
@@ -357,7 +293,7 @@ describe('runRules', function () {
 				any: ['has-target']
 			}, {
 				id: 'first-div',
-				selector: 'div',
+				selector: 'div:not([id=fixture])',
 				any: ['first-div'],
 			}],
 			checks: [{
@@ -367,7 +303,6 @@ describe('runRules', function () {
 				}
 			}, {
 				id: 'first-div',
-				selector: ':not(#fixture)',
 				evaluate: function (node) {
 					this.relatedNodes([node]);
 					return false;
@@ -428,9 +363,13 @@ describe('runRules', function () {
 					stuff: 'blah',
 					impact: 'moderate',
 					passes: [],
+					inapplicable: [],
+					incomplete: [],
 					violations: [{
+						result: 'failed',
 						node: {
 							selector: ['#target'],
+							xpath: ['/div[@id=\'target\']'],
 							source: '<div id="target">Target!</div>'
 						},
 						impact: 'moderate',
@@ -445,7 +384,7 @@ describe('runRules', function () {
 						all: [],
 						none: []
 					}],
-					result: 'FAIL',
+					result: 'failed',
 					tags: []
 				}, {
 					id: 'first-div',
@@ -454,10 +393,15 @@ describe('runRules', function () {
 					bar: 'foo',
 					stuff: 'no',
 					impact: null,
+					inapplicable: [],
+					incomplete: [],
 					violations: [],
 					passes: [{
+						result: 'passed',
+						impact: null,
 						node: {
 							selector: ['#target'],
+							xpath: ['/div[@id=\'target\']'],
 							source: '<div id="target">Target!</div>'
 						},
 						any: [{
@@ -468,13 +412,14 @@ describe('runRules', function () {
 							data: null,
 							relatedNodes: [{
 								selector: ['#target'],
+								xpath: ['/div[@id=\'target\']'],
 								source: '<div id="target">Target!</div>'
 							}]
 						}],
 						all: [],
 						none: []
 					}],
-					result: 'PASS',
+					result: 'passed',
 					tags: []
 				}]);
 			done();
@@ -495,10 +440,136 @@ describe('runRules', function () {
 				function (err) {
 					assert.instanceOf(err, Error);
 					done();
-				}, isNotCalled);
+				});
 			}, 100);
 		});
 	});
 
+	it('should resolve to cantTell when a rule fails', function (done) {
+		axe._load({
+			rules: [{
+				id: 'incomplete-1',
+				selector: '*',
+				none: ['undeffed']
+			}, {
+				id: 'incomplete-2',
+				selector: '*',
+				none: ['thrower']
+			}],
+			checks: [{
+				id: 'undeffed',
+				evaluate: function () {
+					return undefined;
+				}
+			}, {
+				id: 'thrower',
+				evaluate: function () {
+					throw new Error('Check failed to complete');
+				}
+			}]
+		});
+
+		fixture.innerHTML = '<div></div>';
+
+		axe.a11yCheck('#fixture', function (results) {
+			assert.lengthOf(results.incomplete, 2);
+			assert.equal(results.incomplete[0].id, 'incomplete-1');
+			assert.equal(results.incomplete[1].id, 'incomplete-2');
+
+			assert.include(results.incomplete[1].description,
+						'An error occured while running this rule');
+			done();
+		});
+	});
+
+	it('should resolve to cantTell if an error occurs inside frame rules', function (done) {
+		axe._load({
+			rules: [{
+				id: 'incomplete-1',
+				selector: '.nogo',
+				none: ['undeffed']
+			}, {
+				id: 'incomplete-2',
+				selector: '.nogo',
+				none: ['thrower']
+			}],
+			checks: [{
+				id: 'undeffed',
+				evaluate: function () {
+					return false;
+				}
+			}, {
+				id: 'thrower',
+				evaluate: function () {
+					return false;
+				}
+			}]
+		});
+
+		iframeReady('../mock/frames/rule-error.html', fixture, 'context-test', function () {
+			axe.a11yCheck('#fixture', function (results) {
+				assert.lengthOf(results.incomplete, 2);
+				assert.equal(results.incomplete[0].id, 'incomplete-1');
+				assert.equal(results.incomplete[1].id, 'incomplete-2');
+
+				assert.include(results.incomplete[1].description,
+							'An error occured while running this rule');
+				done();
+			}, isNotCalled);
+		});
+	});
 
+	it('should cascade `no elements found` errors in frames to reject run_rules', function (done) {
+		axe._load({ rules: [{
+			id: 'invalidRule'
+		}], checks: [], messages: {}});
+		fixture.innerHTML = '<div id="outer"></div>';
+		var outer = document.getElementById('outer');
+
+		iframeReady('../mock/frames/context.html', outer, 'target', function() {
+
+			runRules([['#target', '#elementNotFound']], {}, function resolve() {
+				assert.ok(false, 'frame should have thrown an error');
+			}, function reject(err) {
+				assert.instanceOf(err, Error);
+				assert.include(err.message, 'No elements found for include in frame Context');
+				done();
+			});
+
+		});
+	});
+
+	it('should not call reject when the resolve throws', function (done) {
+		var rejectCalled = false;
+		axe._load({ rules: [{
+			id: 'html',
+			selector: 'html',
+			any: ['html']
+		}], checks: [{
+			id: 'html',
+			evaluate: function () {
+				return true;
+			}
+		}], messages: {}});
+
+		function resolve() {
+			setTimeout(function () {
+				assert.isFalse(rejectCalled);
+				axe.log = log;
+				done();
+			}, 20);
+			throw new Error('err');
+		}
+		function reject() {
+			rejectCalled = true;
+		}
+
+		var log = axe.log;
+		axe.log = function (e) {
+			assert.equal(e.message, 'err');
+			axe.log = log;
+		};
+		runRules(document, {},resolve, reject);
+
+	});
 });
diff --git a/test/core/public/run.js b/test/core/public/run.js
new file mode 100644
index 0000000000..7e6a48818d
--- /dev/null
+++ b/test/core/public/run.js
@@ -0,0 +1,273 @@
+describe('axe.run', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+	var noop = function () {};
+	var origRunRules = axe._runRules;
+
+	beforeEach(function () {
+		axe._load({
+			rules: [{
+				id: 'test',
+				selector: '*',
+				none: ['fred']
+			}],
+			checks: [{
+				id: 'fred',
+				evaluate: function (node) {
+					this.relatedNodes([node]);
+					return true;
+				}
+			}]
+		});
+	});
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+		axe._audit = null;
+		axe._runRules = origRunRules;
+	});
+
+	it('takes context, options and callback as parameters', function (done) {
+		fixture.innerHTML = '<div id="t1"></div>';
+		var options = {
+			runOnly: {
+			    type: 'rule',
+			    values: ['test']
+			  }
+		};
+
+		axe.run(['#t1'], options, function () {
+			assert.ok(true, 'test completed');
+			done();
+		});
+	});
+
+	it('uses document as content if it is not specified', function (done) {
+		axe._runRules = function (ctxt) {
+			assert.equal(ctxt, document);
+			done();
+		};
+
+		axe.run({ someOption: true }, noop);
+	});
+
+	it('uses an object as options if it is not specified', function (done) {
+		axe._runRules = function (ctxt, opt) {
+			assert.isObject(opt);
+			done();
+		};
+		axe.run(document, noop);
+	});
+
+	it('treats objects with include or exclude as the context object', function (done) {
+		axe._runRules = function (ctxt) {
+			assert.deepEqual(ctxt, {include: '#BoggyB'});
+			done();
+		};
+
+		axe.run({include: '#BoggyB'}, noop);
+	});
+
+	it('treats objects with neither include or exclude as the option object', function (done) {
+		axe._runRules = function (ctxt, opt) {
+			assert.deepEqual(opt.HHG, 'hallelujah');
+			done();
+		};
+
+		axe.run({HHG: 'hallelujah'}, noop);
+	});
+
+	it('does not fail if no callback is specified', function (done) {
+		assert.doesNotThrow(function () {
+			axe.run(done);
+		});
+	});
+
+	describe('callback', function () {
+		it('gives errors to the first argument on the callback', function (done) {
+			axe._runRules = function (ctxt, opt, resolve, reject) {
+				axe._runRules = origRunRules;
+				reject('Ninja rope!');
+			};
+
+			axe.run({ reporter: 'raw' }, function (err) {
+				assert.equal(err, 'Ninja rope!');
+				done();
+			});
+		});
+
+		it('gives results to the second argument on the callback', function (done) {
+			axe._runRules = function (ctxt, opt, resolve) {
+				axe._runRules = origRunRules;
+				resolve('MB Bomb');
+			};
+
+			axe.run({ reporter: 'raw' }, function (err, result) {
+				assert.equal(err, null);
+				assert.equal(result, 'MB Bomb');
+				done();
+			});
+		});
+
+		it('does not run the callback twice if it throws', function (done) {
+			var calls = 0;
+			axe._runRules = function (ctxt, opt, resolve) {
+				resolve([]);
+			};
+
+			var log = axe.log;
+			axe.log = function (e) {
+				assert.equal(e.message, 'err');
+				axe.log = log;
+			};
+			axe.run(function () {
+				calls += 1;
+				if (calls === 1) {
+					setTimeout(function () {
+						assert.equal(calls, 1);
+						axe.log = log;
+						done();
+					}, 20);
+				}
+				throw new Error('err');
+			});
+		});
+	});
+
+
+	describe('promise result', function () {
+		it('returns an error to catch if axe fails',
+		(!window.Promise) ? undefined :  function (done) {
+			axe._runRules = function (ctxt, opt, resolve, reject) {
+				axe._runRules = origRunRules;
+				reject('I surrender!');
+			};
+
+			var p = axe.run({ reporter: 'raw' });
+			p.then(noop)
+			.catch(function (err) {
+				assert.equal(err, 'I surrender!');
+				done();
+			});
+
+			assert.instanceOf(p, window.Promise);
+		});
+
+		it('returns a promise if no callback was given',
+		(!window.Promise) ? undefined :  function (done) {
+			axe._runRules = function (ctxt, opt, resolve) {
+				axe._runRules = origRunRules;
+				resolve('World party');
+			};
+
+			var p = axe.run({ reporter: 'raw' });
+			p.then(function (result) {
+				assert.equal(result, 'World party');
+				done();
+			});
+
+			assert.instanceOf(p, window.Promise);
+		});
+
+		it('does not error if then() throws',
+		(!window.Promise) ? undefined :  function (done) {
+			axe._runRules = function (ctxt, opt, resolve) {
+				resolve([]);
+			};
+
+			axe.run()
+			.then(function () {
+				throw new Error('err');
+			}, function (e) {
+				assert.isNotOk(e, 'Caught callback error in the wrong place');
+				done();
+
+			}).catch(function (e) {
+				assert.equal(e.message, 'err');
+				done();
+			});
+		});
+	});
+
+
+	describe('option reporter', function () {
+		it('sets v1 as the default reporter if audit.reporter is null', function (done) {
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'v1');
+				axe._runRules = origRunRules;
+				done();
+			};
+			axe._audit.reporter = null;
+			axe.run(document, noop);
+		});
+
+		it('uses the audit.reporter if no reporter is set in options', function (done) {
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'raw');
+				axe._runRules = origRunRules;
+				done();
+			};
+			axe._audit.reporter = 'raw';
+			axe.run(document, noop);
+		});
+
+		it('does not override if another reporter is set', function (done) {
+			axe._runRules = function (ctxt, opt) {
+				assert.equal(opt.reporter, 'raw');
+				axe._runRules = origRunRules;
+				done();
+			};
+			axe._audit.reporter = null;
+			axe.run(document, {reporter: 'raw'}, noop);
+		});
+	});
+
+
+	describe('option xpath', function () {
+		it('returns no xpath if the xpath option is not set', function (done) {
+			axe.run('#fixture', function (err, result) {
+				assert.isUndefined(result.violations[0].nodes[0].xpath);
+				done();
+			});
+		});
+
+		it('returns the xpath if the xpath option is true', function (done) {
+			axe.run('#fixture', {
+				xpath: true
+			}, function (err, result) {
+				assert.deepEqual(
+					result.violations[0].nodes[0].xpath,
+					['/div[@id=\'fixture\']']
+				);
+				done();
+			});
+		});
+
+		it('returns xpath on related nodes', function (done) {
+			axe.run('#fixture', {
+				xpath: true
+			}, function (err, result) {
+				assert.deepEqual(
+					result.violations[0].nodes[0].none[0].relatedNodes[0].xpath,
+					['/div[@id=\'fixture\']']
+				);
+				done();
+			});
+		});
+
+		it('returns the xpath on any reporter', function (done) {
+			axe.run('#fixture', {
+				xpath: true,
+				reporter: 'no-passes'
+			}, function (err, result) {
+				assert.deepEqual(
+					result.violations[0].nodes[0].xpath,
+					['/div[@id=\'fixture\']']
+				);
+				done();
+			});
+		});
+	});
+
+});
diff --git a/test/core/reporters/helpers/failure-summary.js b/test/core/reporters/helpers/failure-summary.js
index 596079ad6d..ce95b73210 100644
--- a/test/core/reporters/helpers/failure-summary.js
+++ b/test/core/reporters/helpers/failure-summary.js
@@ -49,7 +49,7 @@ describe('helpers.failureSummary', function() {
 
 	it('should concatenate none and all', function() {
 		var summary = helpers.failureSummary({
-			result: 'FAIL',
+			result: 'failed',
 			any: [],
 			all: [{
 				id: '3',
@@ -69,7 +69,7 @@ describe('helpers.failureSummary', function() {
 
 	it('should return a list of ANYs if none return true', function() {
 		var summary = helpers.failureSummary({
-			result: 'FAIL',
+			result: 'failed',
 			any: [{
 				id: '1',
 				message: '1'
@@ -89,7 +89,7 @@ describe('helpers.failureSummary', function() {
 
 	it('should concatenate anys', function() {
 		var summary = helpers.failureSummary({
-			result: 'FAIL',
+			result: 'failed',
 			any: [{
 				id: '1',
 				message: '1'
diff --git a/test/core/reporters/helpers/format-check.js b/test/core/reporters/helpers/format-check.js
deleted file mode 100644
index 29771ffa53..0000000000
--- a/test/core/reporters/helpers/format-check.js
+++ /dev/null
@@ -1,58 +0,0 @@
-
-describe('helpers.formatCheck', function () {
-	'use strict';
-
-	it('should return id', function () {
-		var result = helpers.formatCheck({
-			id: 'foo',
-			relatedNodes: []
-		});
-
-		assert.equal(result.id, 'foo');
-	});
-
-	it('should return impact', function () {
-		var result = helpers.formatCheck({
-			impact: 'foo',
-			relatedNodes: []
-		});
-
-		assert.equal(result.impact, 'foo');
-	});
-
-	it('should return message', function () {
-		var result = helpers.formatCheck({
-			message: 'foo',
-			relatedNodes: []
-		});
-
-		assert.equal(result.message, 'foo');
-	});
-
-	it('should return data', function () {
-		var result = helpers.formatCheck({
-			data: 'foo',
-			relatedNodes: []
-		});
-
-		assert.equal(result.data, 'foo');
-	});
-
-	it('should format relatedNodes', function () {
-		var result = helpers.formatCheck({
-			relatedNodes: [{
-				source: '<div class="foo1">',
-				selector: '.foo1'
-			}, {
-				source: '<div class="foo2">',
-				selector: '.foo2'
-			}]
-		});
-
-		assert.lengthOf(result.relatedNodes, 2);
-		assert.equal(result.relatedNodes[0].html, '<div class="foo1">');
-		assert.equal(result.relatedNodes[0].target, '.foo1');
-		assert.equal(result.relatedNodes[1].html, '<div class="foo2">');
-		assert.equal(result.relatedNodes[1].target, '.foo2');
-	});
-});
diff --git a/test/core/reporters/helpers/format-checks.js b/test/core/reporters/helpers/format-checks.js
deleted file mode 100644
index a7e8d8a74b..0000000000
--- a/test/core/reporters/helpers/format-checks.js
+++ /dev/null
@@ -1,29 +0,0 @@
-describe('helpers.formatChecks', function () {
-	'use strict';
-
-	var orig;
-	before(function () {
-		orig = helpers.formatCheck;
-	});
-
-	after(function () {
-		helpers.formatCheck = orig;
-	});
-
-	it('should map helpers.formatCheck on each check collection', function () {
-		var expected = ['any', 'all', 'none'];
-		helpers.formatCheck = function (item) {
-			assert.include(expected, item);
-			return expected.indexOf(item);
-		};
-
-		var result = helpers.formatChecks({}, {
-			any: ['any'],
-			all: ['all'],
-			none: ['none']
-		});
-		assert.deepEqual(result.any, [0]);
-		assert.deepEqual(result.all, [1]);
-		assert.deepEqual(result.none, [2]);
-	});
-});
diff --git a/test/core/reporters/helpers/format-node.js b/test/core/reporters/helpers/format-node.js
deleted file mode 100644
index 0cce74c5c9..0000000000
--- a/test/core/reporters/helpers/format-node.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-describe('helpers.formatNode', function () {
-	'use strict';
-
-	it('should return selector as target', function () {
-		var result = helpers.formatNode({ selector: 'foo' });
-		assert.equal(result.target, 'foo');
-	});
-
-	it('should return source as html', function () {
-		var result = helpers.formatNode({ source: 'foo' });
-		assert.equal(result.html, 'foo');
-	});
-
-	it('should default target to null', function () {
-		var result = helpers.formatNode(null);
-		assert.isNull(result.target);
-	});
-
-	it('should default html to null', function () {
-		var result = helpers.formatNode(null);
-		assert.isNull(result.html);
-	});
-});
diff --git a/test/core/reporters/helpers/format-rule-result.js b/test/core/reporters/helpers/format-rule-result.js
deleted file mode 100644
index 9c6b16838b..0000000000
--- a/test/core/reporters/helpers/format-rule-result.js
+++ /dev/null
@@ -1,66 +0,0 @@
-describe('helpers.formatRuleResult', function () {
-	'use strict';
-
-	it('should return id', function () {
-		var result = helpers.formatRuleResult({
-			id: 'foo'
-		});
-
-		assert.equal(result.id, 'foo');
-	});
-
-	it('should return description', function () {
-		var result = helpers.formatRuleResult({
-			description: 'foo'
-		});
-
-		assert.equal(result.description, 'foo');
-	});
-
-	it('should return help', function () {
-		var result = helpers.formatRuleResult({
-			help: 'foo'
-		});
-
-		assert.equal(result.help, 'foo');
-	});
-
-	it('should return helpUrl', function () {
-		var result = helpers.formatRuleResult({
-			helpUrl: 'foo'
-		});
-
-		assert.equal(result.helpUrl, 'foo');
-	});
-
-	it('should default helpUrl to null', function () {
-		var result = helpers.formatRuleResult({});
-
-		assert.isNull(result.helpUrl);
-	});
-
-	it('should set impact to null', function () {
-		var result = helpers.formatRuleResult({
-			impact: 'bob'
-		});
-
-		assert.isNull(result.helpUrl);
-	});
-
-	it('should return tags', function () {
-		var result = helpers.formatRuleResult({
-			tags: 'foo'
-		});
-
-		assert.equal(result.tags, 'foo');
-	});
-
-	it('should set nodes to an empty array', function () {
-		var result = helpers.formatRuleResult({
-			nodes: 'should not respect'
-		});
-
-		assert.isArray(result.nodes);
-		assert.lengthOf(result.nodes, 0);
-	});
-});
diff --git a/test/core/reporters/helpers/split-results-checks.js b/test/core/reporters/helpers/split-results-checks.js
deleted file mode 100644
index e7725302ad..0000000000
--- a/test/core/reporters/helpers/split-results-checks.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-describe('helpers.splitResultsWithChecks', function () {
-	'use strict';
-
-	var orig;
-	beforeEach(function () {
-		orig = helpers.splitResults;
-	});
-
-	afterEach(function () {
-		helpers.splitResults = orig;
-	});
-
-	it('should call helpers.splitResults with helpers.formatChecks as second param', function () {
-		var called = false;
-		helpers.splitResults = function (results, formatter) {
-			called = true;
-			assert.deepEqual(results, ['foo']);
-			assert.equal(formatter, helpers.formatChecks);
-		};
-		helpers.splitResultsWithChecks(['foo']);
-		assert.isTrue(called);
-	});
-});
diff --git a/test/core/reporters/na.js b/test/core/reporters/na.js
index 011548c0fa..f0e71feaa6 100644
--- a/test/core/reporters/na.js
+++ b/test/core/reporters/na.js
@@ -1,10 +1,12 @@
 describe('reporters - na', function() {
 	'use strict';
-	var orig,
-		results = [{
+	var orig, results,
+		_results = [{
 			id: 'noMatch',
 			helpUrl: 'somewhere',
 			description: 'stuff',
+			result: 'inapplicable',
+			impact: null,
 			tags: ['tag3'],
 			violations: [],
 			passes: []
@@ -12,10 +14,13 @@ describe('reporters - na', function() {
 			id: 'gimmeLabel',
 			helpUrl: 'things',
 			description: 'something nifty',
+			result: 'passed',
+			impact: null,
 			tags: ['tag1'],
 			violations: [],
 			passes: [{
-				result: 'PASS',
+				result: 'passed',
+				impact:null,
 				any: [{
 					result: true,
 					relatedNodes: [{
@@ -36,12 +41,12 @@ describe('reporters - na', function() {
 			id: 'idkStuff',
 			description: 'something more nifty',
 			pageLevel: true,
-			result: 'FAIL',
+			result: 'failed',
 			impact: 'cats',
 			tags: ['tag2'],
 			passes: [],
 			violations: [{
-				result: 'FAIL',
+				result: 'failed',
 				all: [{
 					relatedNodes: [{
 						selector: 'joe',
@@ -69,63 +74,71 @@ describe('reporters - na', function() {
 				impact: 'cats'
 			}]
 		}];
+
 	beforeEach(function() {
+		results = JSON.parse(JSON.stringify(_results));
 		axe._load({
-			reporter: 'na',
 			messages: {},
 			rules: [],
 			data: {}
 		});
-		orig = window.runRules;
-		window.runRules = function(ctxt, options, cb) {
+		orig = axe._runRules;
+		axe._runRules = function(ctxt, options, cb) {
 			cb(results);
 		};
 	});
 
 	afterEach(function() {
 		axe._audit = null;
-		window.runRules = orig;
+		axe._runRules = orig;
 	});
 
-	it('should merge the runRules results into violations, passes and notApplicable', function(done) {
-		axe.a11yCheck(document, function(results) {
+	var naOption = { reporter: 'na' };
+
+	it('should merge the runRules results into violations, passes and inapplicable', function(done) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.isObject(results);
 			assert.isArray(results.violations);
 			assert.lengthOf(results.violations, 1);
 			assert.isArray(results.passes);
 			assert.lengthOf(results.passes, 1);
-			assert.isArray(results.notApplicable);
-			assert.lengthOf(results.notApplicable, 1);
+			assert.isArray(results.inapplicable);
+			assert.lengthOf(results.inapplicable, 1);
 
 			done();
 		});
 	});
 	it('should add the rule id to the rule result', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].id, 'idkStuff');
 			assert.equal(results.passes[0].id, 'gimmeLabel');
-			assert.equal(results.notApplicable[0].id, 'noMatch');
+			assert.equal(results.inapplicable[0].id, 'noMatch');
 			done();
 		});
 	});
 	it('should add tags to the rule result', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.deepEqual(results.violations[0].tags, ['tag2']);
 			assert.deepEqual(results.passes[0].tags, ['tag1']);
-			assert.deepEqual(results.notApplicable[0].tags, ['tag3']);
+			assert.deepEqual(results.inapplicable[0].tags, ['tag3']);
 			done();
 		});
 	});
 	it('should add the rule help to the rule result', function(done) {
-		axe.a11yCheck(document, function(results) {
-			assert.isNull(results.violations[0].helpUrl);
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
+			assert.ok(!results.violations[0].helpUrl);
 			assert.equal(results.passes[0].helpUrl, 'things');
-			assert.equal(results.notApplicable[0].helpUrl, 'somewhere');
+			assert.equal(results.inapplicable[0].helpUrl, 'somewhere');
 			done();
 		});
 	});
 	it('should add the html to the node data', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.equal(results.violations[0].nodes[0].html, '<pillock>george bush</pillock>');
@@ -134,7 +147,8 @@ describe('reporters - na', function() {
 		});
 	});
 	it('should add the target selector array to the node data', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['q', 'r', 'pillock']);
@@ -142,30 +156,28 @@ describe('reporters - na', function() {
 		});
 	});
 	it('should add the description to the rule result', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].description, 'something more nifty');
 			assert.equal(results.passes[0].description, 'something nifty');
 			done();
 		});
 	});
 	it('should add the impact to the rule result', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].impact, 'cats');
 			assert.equal(results.violations[0].nodes[0].impact, 'cats');
+			assert.ok(!results.passes[0].impact);
+			assert.ok(!results.passes[0].nodes[0].impact);
 			assert.isNull(results.passes[0].impact);
 			assert.isNull(results.passes[0].nodes[0].impact);
 			done();
 		});
 	});
-	it('should remove result', function(done) {
-		axe.a11yCheck(document, function(results) {
-			assert.isUndefined(results.violations[0].nodes[0].all[0].result);
-			assert.isUndefined(results.passes[0].nodes[0].any[0].result);
-			done();
-		});
-	});
 	it('should map relatedNodes', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations[0].nodes[0].all[0].relatedNodes, 1);
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].target, 'joe');
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].html, 'bob');
@@ -177,13 +189,15 @@ describe('reporters - na', function() {
 		});
 	});
 	it('should include URL', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.url, window.location.href);
 			done();
 		});
 	});
 	it('should include timestamp', function(done) {
-		axe.a11yCheck(document, function(results) {
+		axe.run(naOption, function (err, results) {
+			assert.isNull(err);
 			var timestamp = new Date(results.timestamp);
 			assert.instanceOf(timestamp, Date);
 			assert.closeTo(timestamp.getTime(), Date.now(), 50);
diff --git a/test/core/reporters/no-passes.js b/test/core/reporters/no-passes.js
index 308c015519..431930cf1d 100644
--- a/test/core/reporters/no-passes.js
+++ b/test/core/reporters/no-passes.js
@@ -1,16 +1,19 @@
 describe('reporters - no-passes', function() {
 	'use strict';
-	var orig,
-		results = [{
+	var orig, results,
+		_results = [{
 			id: 'gimmeLabel',
 			helpUrl: 'things',
 			description: 'something nifty',
 			tags: ['tag1'],
+			result: 'passed',
+			impact: null,
 			violations: [],
 			passes: [{
-				result: 'PASS',
+				result: 'passed',
 				any: [{
 					result: true,
+					impact: null,
 					relatedNodes: [{
 						selector: 'bob',
 						source: 'fred'
@@ -29,12 +32,12 @@ describe('reporters - no-passes', function() {
 			id: 'idkStuff',
 			description: 'something more nifty',
 			pageLevel: true,
-			result: 'FAIL',
+			result: 'failed',
 			impact: 'cats',
 			tags: ['tag2'],
 			passes: [],
 			violations: [{
-				result: 'FAIL',
+				result: 'failed',
 				all: [{
 					relatedNodes: [{
 						selector: 'joe',
@@ -63,25 +66,28 @@ describe('reporters - no-passes', function() {
 			}]
 		}];
 	beforeEach(function() {
+		results = JSON.parse(JSON.stringify(_results));
 		axe._load({
-			reporter: 'no-passes',
 			messages: {},
 			rules: [],
 			data: {}
 		});
-		orig = window.runRules;
-		window.runRules = function(ctxt, options, cb) {
+		orig = axe._runRules;
+		axe._runRules = function(ctxt, options, cb) {
 			cb(results);
 		};
 	});
 
+	var noPassOpt = { reporter: 'no-passes' };
+
 	afterEach(function() {
 		axe._audit = null;
-		window.runRules = orig;
+		axe._runRules = orig;
 	});
 
 	it('should merge the runRules results into violations and  exclude passes', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.isObject(results);
 			assert.isArray(results.violations);
 			assert.lengthOf(results.violations, 1);
@@ -91,25 +97,29 @@ describe('reporters - no-passes', function() {
 		});
 	});
 	it('should add the rule id to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].id, 'idkStuff');
 			done();
 		});
 	});
 	it('should add tags to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.deepEqual(results.violations[0].tags, ['tag2']);
 			done();
 		});
 	});
 	it('should add the rule help to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
-			assert.isNull(results.violations[0].helpUrl);
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
+			assert.isNotOk(results.violations[0].helpUrl);
 			done();
 		});
 	});
 	it('should add the html to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.equal(results.violations[0].nodes[0].html, '<pillock>george bush</pillock>');
@@ -117,7 +127,8 @@ describe('reporters - no-passes', function() {
 		});
 	});
 	it('should add the target selector array to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['q', 'r', 'pillock']);
@@ -125,26 +136,23 @@ describe('reporters - no-passes', function() {
 		});
 	});
 	it('should add the description to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].description, 'something more nifty');
 			done();
 		});
 	});
 	it('should add the impact to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].impact, 'cats');
 			assert.equal(results.violations[0].nodes[0].impact, 'cats');
 			done();
 		});
 	});
-	it('should remove result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
-			assert.isUndefined(results.violations[0].nodes[0].all[0].result);
-			done();
-		});
-	});
 	it('should map relatedNodes', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations[0].nodes[0].all[0].relatedNodes, 1);
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].target, 'joe');
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].html, 'bob');
@@ -152,13 +160,15 @@ describe('reporters - no-passes', function() {
 		});
 	});
 	it('should include URL', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.url, window.location.href);
 			done();
 		});
 	});
 	it('should include timestamp', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(noPassOpt, function (err, results) {
+			assert.isNull(err);
 			var timestamp = new Date(results.timestamp);
 			assert.instanceOf(timestamp, Date);
 			assert.closeTo(timestamp.getTime(), Date.now(), 50);
diff --git a/test/core/reporters/raw.js b/test/core/reporters/raw.js
index 1b24997387..c2ce6d0211 100644
--- a/test/core/reporters/raw.js
+++ b/test/core/reporters/raw.js
@@ -3,15 +3,16 @@ describe('reporters - raw', function () {
 
 	it('should pass through object', function () {
 		axe._load({});
-		var orig = window.runRules;
-		window.runRules = function (_, __, cb) {
+		var orig = axe._runRules;
+		axe._runRules = function (_, __, cb) {
 			cb('foo');
 		};
 
-		axe.a11yCheck(document, { reporter: 'raw'}, function (r) {
-			assert.equal(r, 'foo');
+		axe.run({ reporter: 'raw'}, function (err, results) {
+			assert.isNull(err);
+			assert.equal(results, 'foo');
 		});
 
-		window.runRules = orig;
+		axe._runRules = orig;
 	});
 });
diff --git a/test/core/reporters/v1.js b/test/core/reporters/v1.js
index 1a83ee09d4..7766d8ddb5 100644
--- a/test/core/reporters/v1.js
+++ b/test/core/reporters/v1.js
@@ -1,14 +1,15 @@
 describe('reporters - v1', function() {
 	'use strict';
-	var orig,
-		results = [{
+	var orig, results,
+		_results = [{
 			id: 'gimmeLabel',
 			helpUrl: 'things',
 			description: 'something nifty',
 			tags: ['tag1'],
+			result: 'passed',
 			violations: [],
 			passes: [{
-				result: 'PASS',
+				result: 'passed',
 				any: [{
 					result: true,
 					data: 'minkey'
@@ -25,12 +26,12 @@ describe('reporters - v1', function() {
 			id: 'idkStuff',
 			description: 'something more nifty',
 			pageLevel: true,
-			result: 'FAIL',
+			result: 'failed',
 			impact: 'cats',
 			tags: ['tag2'],
 			passes: [],
 			violations: [{
-				result: 'FAIL',
+				result: 'failed',
 				all: [{
 					result: false,
 					data: 'pillock',
@@ -49,9 +50,10 @@ describe('reporters - v1', function() {
 			description: 'something even more nifty',
 			tags: ['tag3'],
 			impact: 'monkeys',
+			result: 'failed',
 			passes: [],
 			violations: [{
-				result: 'FAIL',
+				result: 'failed',
 				impact: 'monkeys',
 				none: [{
 					data: 'foon',
@@ -70,8 +72,9 @@ describe('reporters - v1', function() {
 			description: 'something awesome',
 			tags: ['tag4'],
 			violations: [],
+			result: 'passed',
 			passes: [{
-				result: 'FAO:',
+				result: 'passed',
 				none: [{
 					data: 'clueso',
 					result: true
@@ -83,8 +86,8 @@ describe('reporters - v1', function() {
 			}]
 		}];
 	beforeEach(function() {
+		results = JSON.parse(JSON.stringify(_results));
 		axe._load({
-			reporter: 'v1',
 			messages: {},
 			rules: [],
 			data: {
@@ -127,19 +130,22 @@ describe('reporters - v1', function() {
 				}
 			}
 		});
-		orig = window.runRules;
-		window.runRules = function(ctxt, options, cb) {
+		orig = axe._runRules;
+		axe._runRules = function(ctxt, options, cb) {
 			cb(results);
 		};
 	});
 
 	afterEach(function() {
 		axe._audit = null;
-		window.runRules = orig;
+		axe._runRules = orig;
 	});
 
+	var optionsV1 = { reporter: 'v1' };
+
 	it('should merge the runRules results into violations and passes', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.isObject(results);
 			assert.isArray(results.violations);
 			assert.lengthOf(results.violations, 2);
@@ -150,7 +156,8 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add the rule id to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].id, 'idkStuff');
 			assert.equal(results.violations[1].id, 'bypass');
 			assert.equal(results.passes[0].id, 'gimmeLabel');
@@ -159,7 +166,8 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add tags to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.deepEqual(results.violations[0].tags, ['tag2']);
 			assert.deepEqual(results.violations[1].tags, ['tag3']);
 			assert.deepEqual(results.passes[0].tags, ['tag1']);
@@ -168,16 +176,18 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add the rule help to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
-			assert.isNull(results.violations[0].helpUrl);
-			assert.isNull(results.violations[1].helpUrl);
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
+			assert.isNotOk(results.violations[0].helpUrl);
+			assert.isNotOk(results.violations[1].helpUrl);
 			assert.equal(results.passes[0].helpUrl, 'things');
-			assert.isNull(results.passes[1].helpUrl);
+			assert.isNotOk(results.passes[1].helpUrl);
 			done();
 		});
 	});
 	it('should add the html to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.equal(results.violations[0].nodes[0].html, '<pillock>george bush</pillock>');
@@ -192,7 +202,8 @@ describe('reporters - v1', function() {
 		window.helpers.failureSummary = function() {
 			return 'your foon is ringing';
 		};
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.equal(results.violations[0].nodes[0].failureSummary, 'your foon is ringing');
@@ -201,7 +212,8 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add the target selector array to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['q', 'r', 'pillock']);
@@ -209,7 +221,8 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add the description to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].description, 'something more nifty');
 			assert.equal(results.violations[1].description, 'something even more nifty');
 			assert.equal(results.passes[0].description, 'something nifty');
@@ -218,7 +231,8 @@ describe('reporters - v1', function() {
 		});
 	});
 	it('should add the impact to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV1, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].impact, 'cats');
 			assert.equal(results.violations[0].nodes[0].impact, 'cats');
 			assert.equal(results.violations[1].impact, 'monkeys');
diff --git a/test/core/reporters/v2.js b/test/core/reporters/v2.js
index 3e87f58d7e..76b8581c73 100644
--- a/test/core/reporters/v2.js
+++ b/test/core/reporters/v2.js
@@ -1,16 +1,19 @@
 describe('reporters - v2', function() {
 	'use strict';
-	var orig,
-		results = [{
+	var orig, results,
+		_results = [{
 			id: 'gimmeLabel',
 			helpUrl: 'things',
 			description: 'something nifty',
+			result: 'passed',
+			impact: null,
 			tags: ['tag1'],
 			violations: [],
 			passes: [{
-				result: 'PASS',
+				result: 'passed',
 				any: [{
 					result: true,
+					impact: null,
 					relatedNodes: [{
 						selector: 'bob',
 						source: 'fred'
@@ -29,12 +32,12 @@ describe('reporters - v2', function() {
 			id: 'idkStuff',
 			description: 'something more nifty',
 			pageLevel: true,
-			result: 'FAIL',
+			result: 'failed',
 			impact: 'cats',
 			tags: ['tag2'],
 			passes: [],
 			violations: [{
-				result: 'FAIL',
+				result: 'failed',
 				all: [{
 					relatedNodes: [{
 						selector: 'joe',
@@ -63,25 +66,28 @@ describe('reporters - v2', function() {
 			}]
 		}];
 	beforeEach(function() {
+		results = JSON.parse(JSON.stringify(_results));
 		axe._load({
-			reporter: 'v2',
 			messages: {},
 			rules: [],
 			data: {}
 		});
-		orig = window.runRules;
-		window.runRules = function(ctxt, options, cb) {
+		orig = axe._runRules;
+		axe._runRules = function(ctxt, options, cb) {
 			cb(results);
 		};
 	});
 
 	afterEach(function() {
 		axe._audit = null;
-		window.runRules = orig;
+		axe._runRules = orig;
 	});
 
+	var optionsV2 = { reporter: 'v2' };
+
 	it('should merge the runRules results into violations and passes', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.isObject(results);
 			assert.isArray(results.violations);
 			assert.lengthOf(results.violations, 1);
@@ -92,28 +98,32 @@ describe('reporters - v2', function() {
 		});
 	});
 	it('should add the rule id to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].id, 'idkStuff');
 			assert.equal(results.passes[0].id, 'gimmeLabel');
 			done();
 		});
 	});
 	it('should add tags to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.deepEqual(results.violations[0].tags, ['tag2']);
 			assert.deepEqual(results.passes[0].tags, ['tag1']);
 			done();
 		});
 	});
 	it('should add the rule help to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
-			assert.isNull(results.violations[0].helpUrl);
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
+			assert.isNotOk(results.violations[0].helpUrl);
 			assert.equal(results.passes[0].helpUrl, 'things');
 			done();
 		});
 	});
 	it('should add the html to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.equal(results.violations[0].nodes[0].html, '<pillock>george bush</pillock>');
@@ -122,7 +132,8 @@ describe('reporters - v2', function() {
 		});
 	});
 	it('should add the target selector array to the node data', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.ok(results.violations[0].nodes);
 			assert.equal(results.violations[0].nodes.length, 1);
 			assert.deepEqual(results.violations[0].nodes[0].target, ['q', 'r', 'pillock']);
@@ -130,30 +141,26 @@ describe('reporters - v2', function() {
 		});
 	});
 	it('should add the description to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].description, 'something more nifty');
 			assert.equal(results.passes[0].description, 'something nifty');
 			done();
 		});
 	});
 	it('should add the impact to the rule result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.violations[0].impact, 'cats');
 			assert.equal(results.violations[0].nodes[0].impact, 'cats');
-			assert.isNull(results.passes[0].impact);
-			assert.isNull(results.passes[0].nodes[0].impact);
-			done();
-		});
-	});
-	it('should remove result', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
-			assert.isUndefined(results.violations[0].nodes[0].all[0].result);
-			assert.isUndefined(results.passes[0].nodes[0].any[0].result);
+			assert.isNotOk(results.passes[0].impact);
+			assert.isNotOk(results.passes[0].nodes[0].impact);
 			done();
 		});
 	});
 	it('should map relatedNodes', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations[0].nodes[0].all[0].relatedNodes, 1);
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].target, 'joe');
 			assert.equal(results.violations[0].nodes[0].all[0].relatedNodes[0].html, 'bob');
@@ -165,13 +172,15 @@ describe('reporters - v2', function() {
 		});
 	});
 	it('should include URL', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			assert.equal(results.url, window.location.href);
 			done();
 		});
 	});
 	it('should include timestamp', function(done) {
-		axe.a11yCheck(document, {}, function(results) {
+		axe.run(optionsV2, function (err, results) {
+			assert.isNull(err);
 			var timestamp = new Date(results.timestamp);
 			assert.instanceOf(timestamp, Date);
 			assert.closeTo(timestamp.getTime(), Date.now(), 50);
diff --git a/test/core/utils/aggregate.js b/test/core/utils/aggregate.js
new file mode 100644
index 0000000000..3d62a3d33f
--- /dev/null
+++ b/test/core/utils/aggregate.js
@@ -0,0 +1,48 @@
+describe('aggregate', function () {
+	'use strict';
+
+	var map = [
+		'youngling',
+		'padawan',
+		'knight',
+		'master',
+		'grand master'
+	];
+
+	var values = ['knight', 'master', 'padawan'];
+
+	it('takes a map, values array and initial value', function () {
+		assert.isFunction(axe.utils.aggregate);
+		assert.lengthOf(axe.utils.aggregate, 3);
+
+		assert.doesNotThrow(function () {
+			axe.utils.aggregate(map, values, 'youngling');
+		});
+	});
+
+	it('does not change the values array', function () {
+		var copy = [].concat(values);
+		axe.utils.aggregate(map, values, 'youngling');
+		assert.deepEqual(values, copy);
+	});
+
+	it('picks the value with the highest index in the map, from the list of values', function () {
+		var result = axe.utils.aggregate(map, ['knight', 'master', 'youngling']);
+		assert.equal(result, 'master');
+	});
+
+	it('considers the initial value in addition to the other values', function () {
+		var result = axe.utils.aggregate(map, ['knight', 'master', 'youngling'], 'grand master');
+		assert.equal(result, 'grand master');
+	});
+
+	it('ignores values not on the map', function () {
+		var result = axe.utils.aggregate(map, ['bounty hunter', 'sith lord'], 'youngling');
+		assert.equal(result, 'youngling');
+	});
+
+	it('returns undefined if no value was found', function () {
+		assert.isUndefined(axe.utils.aggregate(map, ['smugler', 'droid']));
+	});
+
+});
\ No newline at end of file
diff --git a/test/core/utils/aggregateChecks.js b/test/core/utils/aggregateChecks.js
new file mode 100644
index 0000000000..0b67f2fb04
--- /dev/null
+++ b/test/core/utils/aggregateChecks.js
@@ -0,0 +1,161 @@
+
+describe('axe.utils.aggregateChecks', function() {
+	'use strict';
+	var FAIL = axe.constants.FAIL;
+	var PASS = axe.constants.PASS;
+	var CANTTELL = axe.constants.CANTTELL;
+	var NA = axe.constants.NA;
+
+	// create an object of check results, padding input with defaults and
+	// wrapping arrays where required
+	function createTestCheckResults(node) {
+		['any','all','none'].forEach(function (type) {
+			if (typeof node[type] === 'undefined') {
+				node[type] = [];
+			} else if (Array.isArray(node[type])) {
+				node[type] = node[type].map(function (val) {
+					if (typeof val !== 'object') {
+						return { result: val };
+					} else {
+						return val;
+					}
+				});
+			} else {
+				if (typeof node[type] !== 'object') {
+					node[type] = { result: node[type] };
+				}
+				node[type] = [ node[type] ];
+			}
+		});
+		return node;
+	}
+
+	beforeEach(function() {
+		axe._load({});
+	});
+
+	it('should be a function', function() {
+		assert.isFunction(axe.utils.aggregateChecks);
+	});
+
+	it('Should be `inapplicable` when no results are given', function () {
+		var ruleResult = axe.utils.aggregateChecks( createTestCheckResults({}) );
+
+		assert.equal(ruleResult.result, NA);
+	});
+
+	it('sets result  to cantTell when result is not a boolean', function() {
+		var values = [undefined, null, 0, 'true', {}, NaN];
+		values.forEach(function (value) {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [{result: value}]
+			}));
+			assert.equal(checkResult.result, CANTTELL);
+		});
+	});
+
+
+	describe('none', function () {
+		it('gives result FAIL when any is true', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				none: [false, true, undefined]
+			}));
+
+			assert.equal(checkResult.result, FAIL);
+		});
+
+		it('gives result CANTTELL when none is true and any is not a boolean', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				none: [undefined, false]
+			}));
+			assert.equal(checkResult.result, CANTTELL);
+		});
+
+		it('gives result PASS when all are FALSE', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				none: [false, false]
+			}));
+			assert.equal(checkResult.result, PASS);
+		});
+	});
+
+
+	describe('any', function () {
+		it('gives result PASS when any is true', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [undefined, true]
+			}));
+			assert.equal(checkResult.result, PASS);
+		});
+
+		it('gives result CANTTELL when none is true and any is not a bool', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [undefined, false]
+			}));
+			assert.equal(checkResult.result, CANTTELL);
+		});
+
+		it('gives result FAIL when all are false', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: [false, false]
+			}));
+			assert.equal(checkResult.result, FAIL);
+		});
+	});
+
+
+	describe('all', function () {
+		it('gives result FAIL when any is false', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				all: [false, true, undefined]
+			}));
+
+			assert.equal(checkResult.result, FAIL);
+		});
+
+		it('gives result CANTTELL when none is false and any is not a boolean', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				all: [undefined, true]
+			}));
+			assert.equal(checkResult.result, CANTTELL);
+		});
+
+		it('gives result PASS when all are true', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				all: [true, true]
+			}));
+			assert.equal(checkResult.result, PASS);
+		});
+	});
+
+	describe('combined', function () {
+		it('gives result PASS when all are PASS', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: true,
+				all: true,
+				none: false,
+			}));
+
+			assert.equal(checkResult.result, PASS);
+		});
+
+		it('gives result CANTTELL when none is FAIL and any is CANTTELL', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: 0,
+				all: true,
+				none: false,
+			}));
+			assert.equal(checkResult.result, CANTTELL);
+		});
+
+		it('gives result FAIL when any are FAIL', function() {
+			var checkResult = axe.utils.aggregateChecks( createTestCheckResults({
+				any: 0,
+				all: false,
+				none: false,
+			}));
+			assert.equal(checkResult.result, FAIL);
+		});
+	});
+
+});
diff --git a/test/core/utils/aggregateResult.js b/test/core/utils/aggregateResult.js
new file mode 100644
index 0000000000..0ba024d915
--- /dev/null
+++ b/test/core/utils/aggregateResult.js
@@ -0,0 +1,184 @@
+describe('axe.utils.aggregateResult', function () {
+	'use strict';
+
+	var results,
+	_results = [{
+		id: 'gimmeLabel',
+		helpUrl: 'things',
+		description: 'something nifty',
+		tags: ['tag1'],
+		result: 'passed',
+		violations: [],
+		passes: [{
+			result: 'passed',
+			any: [{
+				result: true,
+				data: 'minkey'
+			}],
+			all: [],
+			none: [],
+			node: {
+				selector: ['minkey'],
+				frames: [],
+				source: '<minkey>chimp</minky>'
+			}
+		}]
+	}, {
+		id: 'bypass',
+		description: 'something even more nifty',
+		tags: ['tag3'],
+		impact: 'monkeys',
+		result: 'failed',
+		passes: [],
+		violations: [{
+			result: 'failed',
+			impact: 'monkeys',
+			none: [{
+				data: 'foon',
+				impact: 'monkeys',
+				result: true
+			}],
+			any: [],
+			all: [],
+			node: {
+				selector: ['foon'],
+				source: '<foon>telephone</foon>'
+			}
+		}]
+	}, {
+		id: 'idkStuff',
+		description: 'something more nifty',
+		pageLevel: true,
+		result: 'failed',
+		impact: 'cats',
+		tags: ['tag2'],
+		passes: [{
+			result: 'passed',
+			any: [{
+				result: true,
+				data: 'minkey'
+			}],
+			all: [],
+			none: [],
+			node: {
+				selector: ['minkey'],
+				frames: [],
+				source: '<minkey>chimp</minky>'
+			}
+		}],
+		violations: [{
+			result: 'failed',
+			all: [{
+				result: false,
+				data: 'pillock',
+				impact: 'cats'
+			}],
+			any: [],
+			none: [],
+			node: {
+				selector: ['q', 'r', 'pillock'],
+				source: '<pillock>george bush</pillock>'
+			},
+			impact: 'cats'
+		}],
+		incomplete: [{
+			result: 'cantTell',
+			any: [{
+				result: 0,
+				data: 'minkey'
+			}],
+			all: [],
+			none: [],
+			node: {
+				selector: ['minkey'],
+				frames: [],
+				source: '<minkey>chimp</minky>'
+			}
+		}]
+	}, {
+		id: 'blinky',
+		description: 'something awesome',
+		tags: ['tag4'],
+		result: 'inapplicable',
+		passes: [{
+			result: 'passed',
+			any: [{
+				shouldIBeHere: 'no, this should be inapplicable!',
+				result: true,
+				data: 'minkey'
+			}],
+			all: [],
+			none: [],
+			node: {
+				selector: ['minkey'],
+				frames: [],
+				source: '<minkey>chimp</minky>'
+			}
+		}],
+		violations: [],
+		incomplete: []
+	}];
+
+	beforeEach(function() {
+		results = JSON.parse(JSON.stringify(_results));
+	});
+
+	it('creates an object with arrays as properties for each result', function () {
+		var resultObject = axe.utils.aggregateResult(results);
+
+		assert.isArray(resultObject.passes);
+		assert.isArray(resultObject.violations);
+		assert.isArray(resultObject.incomplete);
+		assert.isArray(resultObject.inapplicable);
+	});
+
+	it('copies failures and passes to their respective arrays on the result object', function () {
+		// insert 1 pass and 1 fail
+		var input = [results[0], results[1]];
+		var resultObject = axe.utils.aggregateResult(input);
+
+		assert.lengthOf(resultObject.passes, 1);
+		assert.lengthOf(resultObject.violations, 1);
+		assert.lengthOf(resultObject.incomplete, 0);
+		assert.lengthOf(resultObject.inapplicable, 0);
+
+		// Objects are the same
+		assert.deepEqual(resultObject.passes[0].nodes, input[0].passes);
+		assert.deepEqual(resultObject.violations[0].nodes, input[1].violations);
+
+		// Object is a copy
+		assert.notEqual(resultObject.passes[0].nodes, input[0].passes);
+		assert.notEqual(resultObject.violations[0].nodes, input[1].violations);
+	});
+
+	it('creates a duplicate of the result for each outcome it has', function () {
+		// insert 1 fail, containing a pass, a fail and a cantTell result
+		var input = [results[2]];
+		var resultObject = axe.utils.aggregateResult(input);
+
+		assert.lengthOf(resultObject.passes, 1);
+		assert.lengthOf(resultObject.violations, 1);
+		assert.lengthOf(resultObject.incomplete, 1);
+		assert.lengthOf(resultObject.inapplicable, 0);
+
+		// Objects are the same
+		assert.deepEqual(resultObject.passes[0].nodes, input[0].passes);
+		assert.deepEqual(resultObject.violations[0].nodes, input[0].violations);
+		assert.deepEqual(resultObject.incomplete[0].nodes, input[0].incomplete);
+	});
+
+	it('moves inapplicable results only to the inapplicable array', function () {
+		// insert 1 fail, containing a pass, a fail and a cantTell result
+		var input = [results[3]];
+		var resultObject = axe.utils.aggregateResult(input);
+
+		assert.lengthOf(resultObject.passes, 0);
+		assert.lengthOf(resultObject.violations, 0);
+		assert.lengthOf(resultObject.incomplete, 0);
+		assert.lengthOf(resultObject.inapplicable, 1);
+
+		assert.equal(resultObject.inapplicable[0].id, input[0].id);
+		assert.equal(resultObject.inapplicable[0].description, input[0].description);
+
+	});
+});
\ No newline at end of file
diff --git a/test/core/utils/aggregateRule.js b/test/core/utils/aggregateRule.js
new file mode 100644
index 0000000000..32ca67fa53
--- /dev/null
+++ b/test/core/utils/aggregateRule.js
@@ -0,0 +1,127 @@
+describe('axe.utils.aggregateRule', function() {
+	'use strict';
+	var FAIL = 'failed';
+	var PASS = 'passed';
+	var CANTTELL = 'cantTell';
+	var INAPPLICABLE = 'inapplicable';
+
+	// create an array of check results, padding input with defaults and
+	// wrapping arrays where required
+	function createTestResults() {
+		var args = [].slice.call(arguments);
+		return args.map(function (node) {
+			['any','all','none']
+			.forEach(function (type) {
+				if (typeof node[type] === 'undefined') {
+					node[type] = [];
+				} else if (Array.isArray(node[type])) {
+					node[type] = node[type].map(function (val) {
+						if (typeof val !== 'object') {
+							return { result: val };
+						} else {
+							return val;
+						}
+					});
+				} else {
+					if (typeof node[type] !== 'object') {
+						node[type] = { result: node[type] };
+					}
+					node[type] = [ node[type] ];
+				}
+			});
+			return node;
+		});
+	}
+
+	beforeEach(function() {
+		axe._load({});
+	});
+
+	it('should be a function', function() {
+		assert.isFunction(axe.utils.aggregateRule);
+	});
+
+	it('Should be `inapplicable` when no results are given', function () {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{}, {}
+		));
+
+		assert.equal(ruleResult.result, INAPPLICABLE);
+		assert.lengthOf(ruleResult.inapplicable, 2);
+	});
+
+	it('should assign FAIL to ruleResult over PASS', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{ all: false },
+			{ all: true },
+			{ all: true }
+		));
+		assert.equal(ruleResult.result, FAIL);
+		assert.lengthOf(ruleResult.violations, 1);
+		assert.lengthOf(ruleResult.passes, 2);
+	});
+
+	it('should assign FAIL to ruleResult over CANTTELL', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{ all: false },
+			{ all: 0 },
+			{ all: true }
+		));
+		assert.equal(ruleResult.result, FAIL);
+		assert.lengthOf(ruleResult.violations, 1);
+		assert.lengthOf(ruleResult.incomplete, 1);
+		assert.lengthOf(ruleResult.passes, 1);
+	});
+
+	it('should assign PASS to ruleResult if there are only passing checks', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{ all: true },
+			{ all: true },
+			{ all: true }
+		));
+		assert.equal(ruleResult.result, PASS);
+		assert.lengthOf(ruleResult.passes, 3);
+		assert.lengthOf(ruleResult.violations, 0);
+
+	});
+
+	it('should assign FAIL if there are no passing anys checks', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{ any: false },
+			{ any: false },
+			{ any: false }
+		));
+		assert.equal(ruleResult.result, FAIL);
+		assert.lengthOf(ruleResult.violations, 3);
+		assert.lengthOf(ruleResult.passes, 0);
+	});
+
+	it('should assign CANTTELL over PASS', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults(
+			{ all: true },
+			{ all: 0 },
+			{ all: 0 }
+		));
+		assert.equal(ruleResult.result, CANTTELL);
+		assert.lengthOf(ruleResult.incomplete, 2);
+		assert.lengthOf(ruleResult.passes, 1);
+	});
+
+	it('should raise the highest "raisedMetadata" on failing checks', function() {
+		var ruleResult = axe.utils.aggregateRule( createTestResults({
+				none: { result: true, impact: 'moderate' },
+				any: { result: true, impact: 'minor' },
+				all: [
+					{ result: true, impact: 'critical' },
+					{ result: false, impact: 'serious'}
+				]
+			},
+			{ none: { result: false, impact: 'critical' }},
+			{ none: { result: false, impact: 'critical' }}
+		));
+		assert.equal(ruleResult.impact, 'serious');
+		assert.equal(ruleResult.violations[0].impact, 'serious');
+		assert.isNull(ruleResult.passes[0].impact);
+		assert.isNull(ruleResult.passes[1].impact);
+	});
+});
diff --git a/test/core/utils/collect-results-from-frames.js b/test/core/utils/collect-results-from-frames.js
index 376d37597e..3f1fd36a17 100644
--- a/test/core/utils/collect-results-from-frames.js
+++ b/test/core/utils/collect-results-from-frames.js
@@ -66,7 +66,7 @@ describe('axe.utils.collectResultsFromFrames', function () {
 		});
 
 		frame.id = 'level0';
-		frame.src = '../mock/frames/recursive.html';
+		frame.src = '../mock/frames/nested0.html';
 		fixture.appendChild(frame);
 
 	});
diff --git a/test/core/utils/dq-element.js b/test/core/utils/dq-element.js
index dc04f5e6db..085fd74824 100644
--- a/test/core/utils/dq-element.js
+++ b/test/core/utils/dq-element.js
@@ -39,7 +39,7 @@ describe('DqElement', function () {
 
 	describe('source', function () {
 		it('should include the outerHTML of the element', function () {
-			fixture.innerHTML = '<div id="foo" class="bar">Hello!</div>';
+			fixture.innerHTML = '<div class="bar" id="foo">Hello!</div>';
 
 			var result = new DqElement(fixture.firstChild);
 			assert.equal(result.source, fixture.firstChild.outerHTML);
@@ -67,7 +67,7 @@ describe('DqElement', function () {
 			fixture.innerHTML = div;
 
 			var result = new DqElement(fixture.firstChild);
-			assert.equal(result.source, '<div class="foo" id="foo">');
+			assert.equal(result.source.length, '<div class="foo" id="foo">'.length);
 		});
 
 		it('should use spec object over passed element', function () {
@@ -108,11 +108,38 @@ describe('DqElement', function () {
 
 	});
 
+	describe('xpath', function () {
+		it('should call axe.utils.getXpath', function () {
+			var orig = axe.utils.getXpath;
+			var success = false;
+			var expected = { monkeys: 'bananas' };
+
+			axe.utils.getXpath = function (p) {
+				success = true;
+				assert.equal(fixture, p);
+				return expected;
+			};
+			var result = new DqElement(fixture);
+			assert.deepEqual(result.xpath, [expected]);
+			axe.utils.getXpath = orig;
+		});
+
+		it('should prefer selector from spec object', function () {
+			fixture.innerHTML = '<div id="foo" class="bar">Hello!</div>';
+			var result = new DqElement(fixture.firstChild, {
+				xpath: 'woot'
+			});
+			assert.equal(result.xpath, 'woot');
+		});
+
+	});
+
 	describe('toJSON', function () {
 		it('should only stringify selector and source', function () {
 			var expected = {
 				selector: 'foo > bar > joe',
-				source: '<joe aria-required="true">'
+				source: '<joe aria-required="true">',
+				xpath: '/foo/bar/joe'
 			};
 			var result = new DqElement('joe', expected);
 
diff --git a/test/core/utils/finalize-result.js b/test/core/utils/finalize-result.js
index a1f8efa0a2..6731ef63a0 100644
--- a/test/core/utils/finalize-result.js
+++ b/test/core/utils/finalize-result.js
@@ -1,192 +1,47 @@
-
-describe('axe.utils.finalizeRuleResult', function () {
+describe('axe.utils.finalizeRuleResult', function() {
 	'use strict';
 
-	beforeEach(function () {
-		axe._load({});
+	var origAggregate;
+	beforeEach(function() {
+		origAggregate = axe.utils.aggregateRule;
 	});
 
-	it('should be a function', function () {
-		assert.isFunction(axe.utils.finalizeRuleResult);
+	afterEach(function () {
+		axe.utils.aggregateRule = origAggregate;
 	});
 
-	it('should FAIL ruleResult if a failing (return true) none is found', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				none: [{ result: false }],
-				all: [],
-				any: []
-			}, {
-				none: [{ result: true }],
-				all: [],
-				any: []
-			}, {
-				none: [{ result: true }],
-				all: [],
-				any: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'FAIL');
-		assert.lengthOf(ruleResult.violations, 2);
-		assert.lengthOf(ruleResult.passes, 1);
-
+	it('should be a function', function() {
+		assert.isFunction(axe.utils.finalizeRuleResult);
 	});
 
-	it('should assign FAIL to ruleResult over PASS', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}, {
-				none: [],
-				any: [{ result: true }],
-				all: []
-			}, {
-				none: [{ result: true }],
-				any: [],
-				all: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'FAIL');
-		assert.lengthOf(ruleResult.violations, 1);
-		assert.lengthOf(ruleResult.passes, 2);
+	it('returns the first param object', function () {
+		axe.utils.aggregateRule = function () {};
 
-	});
-
-	it('should assign PASS to ruleResult if there are only passing anys', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}, {
-				any: [{ result: true }],
-				all: [],
-				none: []
-			}, {
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'PASS');
-		assert.lengthOf(ruleResult.passes, 3);
-		assert.lengthOf(ruleResult.violations, 0);
+		var goingIn = {};
+		var comingOut = axe.utils.finalizeRuleResult(goingIn);
 
+		assert.equal(goingIn, comingOut);
 	});
 
-	it('should assign FAIL if there are no passing anys', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				any: [{ result: false }],
-				all: [],
-				none: []
-			}, {
-				any: [{ result: false }],
-				all: [],
-				none: []
-			}, {
-				any: [{ result: false }],
-				all: [],
-				none: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'FAIL');
-		assert.lengthOf(ruleResult.violations, 3);
-		assert.lengthOf(ruleResult.passes, 0);
-
+	it('passes the nodes property to utils.aggregateRule', function() {
+		var isCalled = false;
+		var nodes = [];
+		axe.utils.aggregateRule = function (n) {
+			assert.equal(n, nodes);
+			isCalled = true;
+		};
+		axe.utils.finalizeRuleResult({ nodes: nodes });
+		assert.ok(isCalled);
 	});
 
-	it('should assign FAIL if there is a single non-passing all', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				any: [{ result: false }],
-				all: [],
-				none: []
-			}, {
-				any: [{ result: false }],
-				all: [{ result: false }, { result: true }],
-				none: []
-			}, {
-				any: [{ result: true }],
-				all: [],
-				none: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'FAIL');
-		assert.lengthOf(ruleResult.violations, 2);
-		assert.lengthOf(ruleResult.passes, 1);
-
-	});
-
-	it('should PASS if there are only falsey nones', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}, {
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}, {
-				none: [{ result: false }],
-				any: [],
-				all: []
-			}]
-		});
-		assert.equal(ruleResult.result, 'PASS');
-		assert.lengthOf(ruleResult.violations, 0);
-		assert.lengthOf(ruleResult.passes, 3);
-
+	it('adds properties returned from utils.aggregateRule to the return value', function() {
+		axe.utils.aggregateRule = function () {
+			return {
+				vulgaris:'magistralis'
+			};
+		};
+		var out = axe.utils.finalizeRuleResult({});
+		assert.equal(out.vulgaris, 'magistralis');
 	});
 
-	it('should raise the highest "raisedMetadata" on failing checks', function () {
-		var ruleResult = axe.utils.finalizeRuleResult({
-			pageLevel: false,
-			nodes: [{
-				none: [{
-					result: true,
-					impact: 'moderate'
-				}],
-				any: [{
-					result: true,
-					impact: 'minor'
-				}],
-				all: [{
-					result: true,
-					impact: 'critical'
-				}, {
-					result: false,
-					impact: 'serious'
-				}]
-			}, {
-				none: [{
-					result: false,
-					impact: 'critical'
-				}],
-				any: [],
-				all: []
-			}, {
-				none: [{
-					result: false,
-					impact: 'critical'
-				}],
-				any: [],
-				all: []
-			}]
-		});
-		assert.equal(ruleResult.impact, 'serious');
-		assert.equal(ruleResult.violations[0].impact, 'serious');
-		assert.isUndefined(ruleResult.passes[0].impact);
-		assert.isUndefined(ruleResult.passes[1].impact);
-
-	});
 });
diff --git a/test/core/utils/get-xpath.js b/test/core/utils/get-xpath.js
new file mode 100644
index 0000000000..8f290d3c56
--- /dev/null
+++ b/test/core/utils/get-xpath.js
@@ -0,0 +1,97 @@
+describe('axe.utils.getXpath', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('should be a function', function () {
+		assert.isFunction(axe.utils.getXpath);
+	});
+
+	it('should generate an XPath selector', function () {
+		var node = document.createElement('div');
+		fixture.appendChild(node);
+
+		var sel = axe.utils.getXpath(node);
+
+		assert.equal(sel, '/div[@id=\'fixture\']/div');
+	});
+
+	it('should handle special characters', function () {
+		var node = document.createElement('div');
+		node.id = 'monkeys#are.animals\\ok';
+		fixture.appendChild(node);
+		assert.equal(axe.utils.getXpath(node), '/div[@id=\'monkeys#are.animals\\ok\']');
+	});
+
+	it('should stop on unique ID', function () {
+		var node = document.createElement('div');
+		node.id = 'monkeys';
+		fixture.appendChild(node);
+
+		var sel = axe.utils.getXpath(node);
+		assert.equal(sel, '/div[@id=\'monkeys\']');
+	});
+
+	it('should not use ids if they are not unique', function () {
+		var node = document.createElement('div');
+		node.id = 'monkeys';
+		fixture.appendChild(node);
+
+		node = document.createElement('div');
+		node.id = 'monkeys';
+		fixture.appendChild(node);
+
+		var sel = axe.utils.getXpath(node);
+
+		assert.equal(sel, '/div[@id=\'fixture\']/div[2]');
+	});
+
+	it('should properly calculate number when siblings are of different type', function () {
+		var node, target;
+		node = document.createElement('span');
+		fixture.appendChild(node);
+
+		node = document.createElement('span');
+		fixture.appendChild(node);
+
+		node = document.createElement('div');
+		fixture.appendChild(node);
+
+		node = document.createElement('div');
+		target = node;
+		fixture.appendChild(node);
+
+		node = document.createElement('div');
+		fixture.appendChild(node);
+
+		node = document.createElement('span');
+		fixture.appendChild(node);
+
+		var sel = axe.utils.getXpath(target);
+
+		assert.equal(sel, '/div[@id=\'fixture\']/div[2]');
+	});
+
+	it('should work on the documentElement', function () {
+		var sel = axe.utils.getXpath(document.documentElement);
+		assert.equal(sel, '/html');
+	});
+
+	it('should work on the body', function () {
+		var sel = axe.utils.getXpath(document.body);
+		assert.equal(sel, '/html/body');
+	});
+
+	it('should work on namespaced elements', function () {
+		fixture.innerHTML = '<hx:include>Hello</hx:include>';
+		var node = fixture.firstChild;
+		var sel = axe.utils.getXpath(node);
+		
+		assert.equal(sel, '/div[@id=\'fixture\']/hx:include');
+	});
+
+});
diff --git a/test/core/utils/pollyfills.elements-from-point.js b/test/core/utils/pollyfills.elements-from-point.js
new file mode 100644
index 0000000000..3ef52419f7
--- /dev/null
+++ b/test/core/utils/pollyfills.elements-from-point.js
@@ -0,0 +1,150 @@
+describe('document.elementsFromPoint pollyfills', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+
+	afterEach(function () {
+		document.getElementById('fixture').innerHTML = '';
+	});
+
+	it('ensures document.elementsFromPoint is always there', function () {
+		assert.isFunction(document.elementsFromPoint);
+	});
+
+	it('returns document.elementsFromPoint if it is set', function () {
+		var orig = document.elementsFromPoint;
+		document.elementsFromPoint = function () {
+			return 123;
+		};
+
+		var elmFromPt = axe.utils.pollyfillElementsFromPoint();
+		assert.equal(elmFromPt(), 123);
+		document.elementsFromPoint = orig;
+	});
+
+	it('returns document.msElementsFromPoint if elementsFromPoint is undefined', function () {
+		var orig = document.elementsFromPoint;
+		var msOrig = document.msElementsFromPoint;
+
+		document.elementsFromPoint = undefined;
+		document.msElementsFromPoint = function () {
+			return 123;
+		};
+
+		var elmFromPt = axe.utils.pollyfillElementsFromPoint();
+		assert.equal(elmFromPt(), 123);
+
+		document.elementsFromPoint = orig;
+		document.msElementsFromPoint = msOrig;
+	});
+
+	it('returns the pollyfill no native function is available', function () {
+		var orig = document.elementsFromPoint;
+		var msOrig = document.msElementsFromPoint;
+
+		document.elementsFromPoint = undefined;
+		document.msElementsFromPoint = undefined;
+
+		var elmFromPt = axe.utils.pollyfillElementsFromPoint();
+		assert.isFunction(elmFromPt);
+
+		document.elementsFromPoint = orig;
+		document.msElementsFromPoint = msOrig;
+	});
+
+	describe('pollyfill function', function () {
+		var orig, msOrig;
+		before(function () {
+			orig = document.elementsFromPoint;
+			msOrig = document.msElementsFromPoint;
+
+			document.elementsFromPoint = undefined;
+			document.msElementsFromPoint = undefined;
+
+			document.elementsFromPoint = axe.utils.pollyfillElementsFromPoint();
+		});
+		
+		after(function () {
+			document.elementsFromPoint = orig;
+			document.msElementsFromPoint = msOrig;
+		});
+
+		it('should return positioned elements properly', function () {
+			fixture.innerHTML = '<div id="container" style="position: absolute; top: 0px; left: 0px; height: 100px; ' +
+				'width: 90px; background-color: rgba(0, 128, 0, 0.5);">' +
+				'<div id="pos" style="position: absolute; top: 50px; left: 40px; height: 40px; ' +
+				'width: 30px; background-color: rgba(0, 128, 0, 0.5);"></div>' +
+				'<div id="parent" style="position: absolute; top: 0px; left: 0px; height: 40px; ' +
+				'width: 30px; background-color: rgba(0, 128, 0, 0.5);">' +
+				'<div id="target" style="position: absolute; top: 60px; left: 45px; height: 20px; ' +
+				'width: 15px; background-color: rgba(0, 128, 0, 0.5);">' +
+				'</div></div></div>';
+			var target = fixture.querySelector('#target');
+			var pos = fixture.querySelector('#pos');
+			var container = fixture.querySelector('#container');
+
+			target.scrollIntoView();
+			var rect = target.getBoundingClientRect();
+
+			var visualParents = document.elementsFromPoint(
+				Math.ceil(rect.left + 1),
+				Math.ceil(rect.top + 1)
+			);
+			assert.deepEqual(visualParents.slice(0, 3), [target, pos, container]);
+		});
+
+		it('should return inline elements properly', function () {
+			fixture.innerHTML = '<div id="container" style="position: absolute; top: 0px; left: 0px; height: 100px; ' +
+				'width: 90px; background-color: rgba(0, 128, 0, 0.5);">' +
+				'<span id="pos" style="position: absolute; top: 60px; left: 45px;' +
+				'background-color: rgba(0, 128, 0, 0.5);">Text goes here</span>' +
+				'<span id="parent" style="position: absolute; top: 0px; left: 0px;' +
+				'background-color: rgba(0, 128, 0, 0.5);">' +
+				'<span id="target" style="position: absolute; top: 60px; left: 45px;' +
+				'background-color: rgba(0, 128, 0, 0.5);">Text goes here' +
+				'</span></span></div>';
+			var target = fixture.querySelector('#target');
+			var pos = fixture.querySelector('#pos');
+			var container = fixture.querySelector('#container');
+
+			target.scrollIntoView();
+			var rect = target.getBoundingClientRect();
+
+			var visualParents = document.elementsFromPoint(
+				Math.ceil(rect.left + 1),
+				Math.ceil(rect.top + 1)
+			);
+			assert.deepEqual(visualParents.slice(0, 3), [target, pos, container]);
+		});
+
+		it('should return normal flow elements properly', function () {
+			fixture.innerHTML = '<div id="parent" style="background-color: rgba(0, 128, 0, 0.5); height: 40px; width: 30px;">' +
+				'<div id="target" style="background-color: rgba(0, 128, 0, 0.5); height: 20px; width: 15px;">' +
+				'</div></div>';
+			var target = fixture.querySelector('#target');
+			var parent = fixture.querySelector('#parent');
+
+			target.scrollIntoView();
+			var rect = target.getBoundingClientRect();
+
+			var visualParents = document.elementsFromPoint(Math.ceil(rect.left), Math.ceil(rect.top));
+			assert.deepEqual(visualParents.slice(0, 3), [target, parent, fixture]);
+		});
+
+		it('returns elements with negative z-index after the body', function () {
+			fixture.innerHTML = '<div id="target" style="z-index:-1; position:absolute;">Target!</div>' +
+				'<div id="sibling">Some text</div>';
+			var target = fixture.querySelector('#target');
+
+			target.scrollIntoView();
+			var rect = target.getBoundingClientRect();
+
+			var visualParents = document.elementsFromPoint(Math.ceil(rect.left), Math.ceil(rect.top));
+
+			// Last two element should be: body, target (due to z-index:-1), html
+			assert.deepEqual(visualParents.slice(-3), [document.body, target, document.documentElement]);
+		});
+
+	});
+
+});
diff --git a/test/core/utils/respondable.js b/test/core/utils/respondable.js
index d7cf4b6bb4..0b8984d83b 100644
--- a/test/core/utils/respondable.js
+++ b/test/core/utils/respondable.js
@@ -332,6 +332,16 @@ describe('axe.utils.respondable', function () {
 		assert.isTrue(success);
 	});
 
+	it('uses respondable.isInFrame() to check if the page is in a frame or not', function() {
+		assert.equal(axe.utils.respondable.isInFrame(), !!window.frameElement);
+
+		assert.isFalse(axe.utils.respondable.isInFrame({
+			frameElement: null
+		}));
+		assert.isTrue(axe.utils.respondable.isInFrame({
+			frameElement: document.createElement('iframe')
+		}));
+	});
 
 	describe('subscribe', function () {
 		it('should be a function', function () {
diff --git a/test/core/utils/rule-should-run.js b/test/core/utils/rule-should-run.js
index 2c64cf29d0..35a6b14919 100644
--- a/test/core/utils/rule-should-run.js
+++ b/test/core/utils/rule-should-run.js
@@ -150,6 +150,89 @@ describe('axe.utils.ruleShouldRun', function () {
 
 	});
 
+	describe('default axe._tagExclude', function () {
+
+		var origTagExclude;
+		before(function () {
+			axe._load({});
+			origTagExclude = axe._audit.tagExclude;
+		});
+		after(function () {
+			axe._audit.tagExclude = origTagExclude;
+		});
+
+		beforeEach(function () {
+			axe._audit.tagExclude = [];
+		});
+
+		it('excludes rules with a tag put in axe._tagExclude', function () {
+			axe._audit.tagExclude = ['the-cheat'];
+			assert.isTrue(axe.utils.ruleShouldRun({
+				id: 'e-mail',
+				enabled: true,
+				tags: ['strongbad']
+			}, {}, {}));
+
+			assert.isFalse(axe.utils.ruleShouldRun({
+				id: 'party',
+				enabled: true,
+				tags: ['the-cheat']
+			}, {}, {}));
+		});
+
+		it('adds axe.tagExclude to the existing exclude tags', function () {
+			axe._audit.tagExclude = ['the-cheat'];
+			assert.isFalse(axe.utils.ruleShouldRun({
+				id: 'e-mail',
+				enabled: true,
+				tags: ['the-cheat']
+			}, {}, {
+				runOnly: {
+					type: 'tag',
+					values: {exclude: ['strongbad']}
+				}
+			}));
+		});
+
+		it('does not exclude tags explicitly included', function () {
+			axe._audit.tagExclude = ['the-cheat'];
+			assert.isTrue(axe.utils.ruleShouldRun({
+				id: 'e-mail',
+				enabled: false,
+				tags: ['the-cheat']
+			}, {}, {
+				runOnly: {
+					type: 'tag',
+					values: {include: ['the-cheat']}
+				}
+			}));
+
+			assert.isTrue(axe.utils.ruleShouldRun({
+				id: 'e-mail',
+				enabled: false,
+				tags: ['the-cheat']
+			}, {}, {
+				runOnly: {
+					type: 'rule',
+					values: ['e-mail']
+				}
+			}));
+
+			assert.isTrue(axe.utils.ruleShouldRun({
+				id: 'e-mail',
+				enabled: false,
+				tags: ['the-cheat']
+			}, {}, {
+				rules: {
+					'e-mail': {
+						enabled: true
+					}
+				},
+			}));
+
+		});
+
+	});
 
 
 	describe('runOnly type:tag', function () {
diff --git a/test/integration/full/bypass/fail.js b/test/integration/full/bypass/fail.js
index dea9a0e4d3..fa0f9bc1d0 100644
--- a/test/integration/full/bypass/fail.js
+++ b/test/integration/full/bypass/fail.js
@@ -5,7 +5,9 @@ describe('bypass fail test', function () {
 		var mocha = document.getElementById('mocha'),
 			html = mocha.innerHTML;
 		mocha.innerHTML = '';
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['bypass'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function (err, r) {
+			assert.isNull(err);
+			
 			results = r;
 			mocha.innerHTML = html;
 			done();
diff --git a/test/integration/full/bypass/pass-tests.js b/test/integration/full/bypass/pass-tests.js
index f979992eef..935f2ccf00 100644
--- a/test/integration/full/bypass/pass-tests.js
+++ b/test/integration/full/bypass/pass-tests.js
@@ -2,7 +2,8 @@ describe('bypass aria header test ' + window.location.pathname, function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['bypass'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['bypass'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/context/context.html b/test/integration/full/context/context.html
index 0d170c71c3..c5da291cde 100644
--- a/test/integration/full/context/context.html
+++ b/test/integration/full/context/context.html
@@ -9,7 +9,7 @@
 	<script src="/axe.js"></script>
 	<script>
 		mocha.setup({
-			timeout: 10000,
+			timeout: 50000,
 			ui: 'bdd'
 		});
 		var assert = chai.assert;
@@ -17,7 +17,7 @@
 </head>
 <body>
 	<div id="frame-container">
-		<iframe id="frame" src="frames/level1.html"></iframe>
+		<iframe id="myframe" src="frames/level1.html"></iframe>
 	</div>
 	<div id="mocha"></div>
 	<script src="context.js"></script>
diff --git a/test/integration/full/context/context.js b/test/integration/full/context/context.js
index 32ba292679..d49d227736 100644
--- a/test/integration/full/context/context.js
+++ b/test/integration/full/context/context.js
@@ -1,29 +1,40 @@
-
 describe('context test', function () {
 	'use strict';
 
-	var config = { runOnly: { type: 'rule', values: ['document-title'] } };
+	var config = { runOnly: { type: 'rule', values: ['html-has-lang'] } };
 	before(function (done) {
-		window.addEventListener('load', function () {
-			done();
-		});
+		var frame = document.getElementById('myframe');
+		if (frame.contentWindow.document.readyState === 'complete') {
+			setTimeout(function () {
+				done();
+			}, 1000);
+		} else {
+			frame.addEventListener('load', function () {
+				setTimeout(function () {
+					done();
+				}, 1000);
+			});
+		}
 	});
 
+
 	describe('direct exclude', function () {
 
 		describe('no include', function () {
 
 			it('should find no violations given a selector array', function (done) {
-				axe.a11yCheck({ exclude: [['iframe']] }, config, function (results) {
+				axe.run({ exclude: [['iframe']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
 
 			it('should find one violation given a multi-level selector array', function (done) {
-				axe.a11yCheck({ exclude: [['iframe', 'iframe']] }, config, function (results) {
+				axe.run({ exclude: [['iframe', 'iframe']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 1, 'violations');
 					assert.lengthOf(results.violations[0].nodes, 1, 'level1.html; 2-a & 2-b excluded');
 					assert.lengthOf(results.passes, 1, 'passes');
@@ -33,28 +44,32 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a direct reference', function (done) {
-				axe.a11yCheck({ exclude: [document.querySelector('iframe')] }, config, function (results) {
+				axe.run({ exclude: [document.querySelector('iframe')] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
 
 			it('should find no violations given a NodeList', function (done) {
-				axe.a11yCheck({ exclude: document.getElementsByTagName('iframe') }, config, function (results) {
+				axe.run({ exclude: document.getElementsByTagName('iframe') }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
+
 		});
 
 		describe('body include', function () {
 
 			it('should find no violations given a selector array', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [['iframe']] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [['iframe']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -62,7 +77,8 @@ describe('context test', function () {
 			});
 
 			it('should find one violation given a multi-level selector array', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [['iframe', 'iframe']] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [['iframe', 'iframe']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 1, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -70,7 +86,8 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a direct reference', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [document.querySelector('iframe')] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [document.querySelector('iframe')] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -78,7 +95,8 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a NodeList', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: document.getElementsByTagName('iframe') }, config, function (results) {
+				axe.run({ include: [document.body], exclude: document.getElementsByTagName('iframe') }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -90,7 +108,8 @@ describe('context test', function () {
 
 	describe('indirect exclude', function () {
 		it('should find no nodes', function (done) {
-			axe.a11yCheck({ include: [document.body], exclude: [['#frame']] }, config, function (results) {
+			axe.run({ include: [document.body], exclude: [['#myframe']] }, config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 0, 'violations');
 				assert.lengthOf(results.passes, 0, 'passes');
 				done();
@@ -100,16 +119,18 @@ describe('context test', function () {
 		describe('no include', function () {
 
 			it('should find no violations given a selector array', function (done) {
-				axe.a11yCheck({ exclude: [['#frame-container']] }, config, function (results) {
+				axe.run({ exclude: [['#frame-container']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
 
 			it('should find one violation given a multi-level selector array', function (done) {
-				axe.a11yCheck({ exclude: [['iframe', 'body']] }, config, function (results) {
+				axe.run({ exclude: [['iframe', 'body']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 1, 'violations');
 					assert.lengthOf(results.violations[0].nodes, 1, 'level1.html; 2-a & 2-b excluded');
 					assert.lengthOf(results.passes, 1, 'passes');
@@ -119,19 +140,21 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a direct reference', function (done) {
-				axe.a11yCheck({ exclude: [document.querySelector('#frame-container')] }, config, function (results) {
+				axe.run({ exclude: [document.querySelector('#frame-container')] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
 
 			it('should find no violations given a NodeList', function (done) {
-				axe.a11yCheck({ exclude: document.getElementsByTagName('div') }, config, function (results) {
+				axe.run({ exclude: document.getElementsByTagName('div') }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 1, 'passes');
-					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a title');
+					assert.lengthOf(results.passes[0].nodes, 1, 'context.html has a lang attribute');
 					done();
 				});
 			});
@@ -140,7 +163,8 @@ describe('context test', function () {
 		describe('body include', function () {
 
 			it('should find no violations given a selector array', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [['#frame-container']] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [['#frame-container']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -148,7 +172,8 @@ describe('context test', function () {
 			});
 
 			it('should find one violation given a multi-level selector array', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [['iframe', 'body']] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [['iframe', 'body']] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 1, 'violations');
 					assert.lengthOf(results.violations[0].nodes, 1, 'level1.html; 2-a & 2-b excluded');
 					assert.lengthOf(results.passes, 0, 'passes');
@@ -157,7 +182,8 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a direct reference', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: [document.querySelector('#frame-container')] }, config, function (results) {
+				axe.run({ include: [document.body], exclude: [document.querySelector('#frame-container')] }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -165,7 +191,8 @@ describe('context test', function () {
 			});
 
 			it('should find no violations given a NodeList', function (done) {
-				axe.a11yCheck({ include: [document.body], exclude: document.getElementsByTagName('div') }, config, function (results) {
+				axe.run({ include: [document.body], exclude: document.getElementsByTagName('div') }, config, function (err, results) {
+					assert.isNull(err);
 					assert.lengthOf(results.violations, 0, 'violations');
 					assert.lengthOf(results.passes, 0, 'passes');
 					done();
@@ -175,7 +202,8 @@ describe('context test', function () {
 	});
 	describe('direct include', function () {
 		it('should find the frames given a context object', function (done) {
-			axe.a11yCheck({ include: [['#frame']] }, config, function (results) {
+			axe.run({ include: [['#myframe']] }, config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -183,7 +211,8 @@ describe('context test', function () {
 			});
 		});
 		it('should find the frames given a direct reference', function (done) {
-			axe.a11yCheck(document.getElementById('frame'), config, function (results) {
+			axe.run(document.getElementById('myframe'), config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -191,7 +220,8 @@ describe('context test', function () {
 			});
 		});
 		it('should find the frames given a NodeList', function (done) {
-			axe.a11yCheck(document.getElementsByTagName('iframe'), config, function (results) {
+			axe.run(document.getElementsByTagName('iframe'), config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -202,7 +232,8 @@ describe('context test', function () {
 
 	describe('indirect include', function () {
 		it('should find the frames given context object with a node reference', function (done) {
-			axe.a11yCheck({ include: [document.body] }, config, function (results) {
+			axe.run({ include: [document.body] }, config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -210,7 +241,8 @@ describe('context test', function () {
 			});
 		});
 		it('should find the frames give a node', function (done) {
-			axe.a11yCheck(document.body, config, function (results) {
+			axe.run(document.body, config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -218,7 +250,8 @@ describe('context test', function () {
 			});
 		});
 		it('should find the frames give a NodeList', function (done) {
-			axe.a11yCheck(document.getElementsByTagName('body'), config, function (results) {
+			axe.run(document.getElementsByTagName('body'), config, function (err, results) {
+				assert.isNull(err);
 				assert.lengthOf(results.violations, 1, 'violations');
 				assert.lengthOf(results.violations[0].nodes, 3, 'violation nodes');
 				assert.lengthOf(results.passes, 0, 'passes');
@@ -227,4 +260,4 @@ describe('context test', function () {
 		});
 	});
 
-});
+});
\ No newline at end of file
diff --git a/test/integration/full/contrast/sticky-header.js b/test/integration/full/contrast/sticky-header.js
index f4e57edf51..62f7f309f6 100644
--- a/test/integration/full/contrast/sticky-header.js
+++ b/test/integration/full/contrast/sticky-header.js
@@ -3,7 +3,8 @@ describe('color-contrast sticky header test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['color-contrast'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['color-contrast'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/definition-list/dl-role.js b/test/integration/full/definition-list/dl-role.js
index 39a3bf9742..cfe1dec1f3 100644
--- a/test/integration/full/definition-list/dl-role.js
+++ b/test/integration/full/definition-list/dl-role.js
@@ -2,7 +2,8 @@
 describe('definition-list overriden with ARIA role', function () {
 	'use strict';
 	it('should find no matches', function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['definition-list'] } }, function (results) {
+		axe.run({ runOnly: { type: 'rule', values: ['definition-list'] } }, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 0);
 			assert.lengthOf(results.passes, 0);
 			done();
diff --git a/test/integration/full/definition-list/dlitem-role.js b/test/integration/full/definition-list/dlitem-role.js
index 41a569e7dd..2f4bd16adc 100644
--- a/test/integration/full/definition-list/dlitem-role.js
+++ b/test/integration/full/definition-list/dlitem-role.js
@@ -2,7 +2,8 @@
 describe('dlitem overriden with ARIA role', function () {
 	'use strict';
 	it('should find no matches', function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['dlitem'] } }, function (results) {
+		axe.run({ runOnly: { type: 'rule', values: ['dlitem'] } }, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 0);
 			assert.lengthOf(results.passes, 0);
 			done();
diff --git a/test/integration/full/document-title/document-title-fail.html b/test/integration/full/document-title/document-title-fail.html
new file mode 100644
index 0000000000..c1e59e358b
--- /dev/null
+++ b/test/integration/full/document-title/document-title-fail.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en" id="fail1">
+<head>
+	<meta charset="utf8">
+	<link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
+	<script src="/node_modules/mocha/mocha.js"></script>
+	<script src="/node_modules/chai/chai.js"></script>
+	<script src="/axe.js"></script>
+	<script>
+		mocha.setup({
+			timeout: 10000,
+			ui: 'bdd'
+		});
+		var assert = chai.assert;
+	</script>
+</head>
+<body>
+	<iframe id="frame1" src="frames/level1.html"></iframe>
+	<div id="mocha"></div>
+	<script src="document-title-fail.js"></script>
+	<script src="/test/integration/adapter.js"></script>
+</body>
+</html>
diff --git a/test/integration/full/document-title/document-title-fail.js b/test/integration/full/document-title/document-title-fail.js
new file mode 100644
index 0000000000..44076049ea
--- /dev/null
+++ b/test/integration/full/document-title/document-title-fail.js
@@ -0,0 +1,36 @@
+
+describe('document-title test failure', function () {
+	'use strict';
+	var results;
+
+	before(function (done) {
+		axe.run({ runOnly: { type: 'rule', values: ['document-title'] } }, function (err, r) {
+			assert.isNull(err);
+			results = r;
+			done();
+		});
+	});
+
+	describe('violations', function () {
+		it('should find 1', function () {
+			assert.lengthOf(results.violations[0].nodes, 1);
+		});
+		it('should find first level iframe', function () {
+			assert.deepEqual(results.violations[0].nodes[0].target, ['#fail1']);
+		});
+	});
+
+	describe('passes', function () {
+		it('should find 0', function () {
+			assert.lengthOf(results.passes, 0);
+		});
+	});
+
+	it('should find 0 inapplicable', function () {
+		assert.lengthOf(results.inapplicable, 0);
+	});
+
+	it('should find 0 incomplete', function () {
+		assert.lengthOf(results.incomplete, 0);
+	});
+});
diff --git a/test/integration/full/document-title/document-title.html b/test/integration/full/document-title/document-title-pass.html
similarity index 92%
rename from test/integration/full/document-title/document-title.html
rename to test/integration/full/document-title/document-title-pass.html
index 20e5ad0ba3..5071660939 100644
--- a/test/integration/full/document-title/document-title.html
+++ b/test/integration/full/document-title/document-title-pass.html
@@ -18,7 +18,7 @@
 <body>
 	<iframe id="frame1" src="frames/level1.html"></iframe>
 	<div id="mocha"></div>
-	<script src="document-title.js"></script>
+	<script src="document-title-pass.js"></script>
 	<script src="/test/integration/adapter.js"></script>
 </body>
 </html>
diff --git a/test/integration/full/document-title/document-title-pass.js b/test/integration/full/document-title/document-title-pass.js
new file mode 100644
index 0000000000..4fc62701fd
--- /dev/null
+++ b/test/integration/full/document-title/document-title-pass.js
@@ -0,0 +1,39 @@
+
+describe('document-title test pass', function () {
+	'use strict';
+	var results;
+	before(function (done) {
+		window.addEventListener('load', function () {
+			axe.run({ runOnly: { type: 'rule', values: ['document-title'] } }, function (err, r) {
+				assert.isNull(err);
+				results = r;
+				done();
+			});
+		});
+	});
+
+	describe('violations', function () {
+		it('should find 0', function () {
+			assert.lengthOf(results.violations, 0);
+		});
+	});
+
+	describe('passes', function () {
+		it('should find 1', function () {
+			assert.lengthOf(results.passes[0].nodes, 1);
+		});
+
+		it('should find #pass1', function () {
+			assert.deepEqual(results.passes[0].nodes[0].target, ['#pass1']);
+		});
+	});
+
+	it('should find 0 inapplicable', function () {
+		assert.lengthOf(results.inapplicable, 0);
+	});
+
+	it('should find 0 incomplete', function () {
+		assert.lengthOf(results.incomplete, 0);
+	});
+
+});
diff --git a/test/integration/full/document-title/document-title.js b/test/integration/full/document-title/document-title.js
deleted file mode 100644
index 4e00b06ecd..0000000000
--- a/test/integration/full/document-title/document-title.js
+++ /dev/null
@@ -1,39 +0,0 @@
-
-describe('document-title test', function () {
-	'use strict';
-	var results;
-	before(function (done) {
-		window.addEventListener('load', function () {
-			axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['document-title'] } }, function (r) {
-				results = r;
-				done();
-			});
-		});
-	});
-
-	describe('violations', function () {
-		it('should find 2', function () {
-			assert.lengthOf(results.violations[0].nodes, 2);
-		});
-		it('should find first level iframe', function () {
-			assert.deepEqual(results.violations[0].nodes[0].target, ['#frame1', '#violation1']);
-		});
-		it('should find second level iframe', function () {
-			assert.deepEqual(results.violations[0].nodes[1].target, ['#frame1', '#frame2', '#violation2']);
-		});
-	});
-
-	describe('passes', function () {
-		it('should find 2', function () {
-			assert.lengthOf(results.passes[0].nodes, 2);
-		});
-
-		it('should find #pass1', function () {
-			assert.deepEqual(results.passes[0].nodes[0].target, ['#pass1']);
-		});
-
-		it('should find #pass2', function () {
-			assert.deepEqual(results.passes[0].nodes[1].target, ['#frame1', '#frame3', '#pass2']);
-		});
-	});
-});
diff --git a/test/integration/full/html-has-lang/html-has-lang.js b/test/integration/full/html-has-lang/html-has-lang.js
index 4d324d53d0..bffeadca65 100644
--- a/test/integration/full/html-has-lang/html-has-lang.js
+++ b/test/integration/full/html-has-lang/html-has-lang.js
@@ -3,12 +3,18 @@ describe('html-has-lang test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		window.addEventListener('load', function () {
-			axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['html-has-lang'] } }, function (r) {
+		function start() {
+			axe.run({ runOnly: { type: 'rule', values: ['html-has-lang'] } }, function (err, r) {
+				assert.isNull(err);
 				results = r;
 				done();
 			});
-		});
+		}
+		if (document.readyState !== 'complete') {
+			window.addEventListener('load', start);
+		} else {
+			start();
+		}
 	});
 
 	describe('violations', function () {
diff --git a/test/integration/full/html-lang-valid/html-lang-valid.js b/test/integration/full/html-lang-valid/html-lang-valid.js
index 66401973c8..69b701a846 100644
--- a/test/integration/full/html-lang-valid/html-lang-valid.js
+++ b/test/integration/full/html-lang-valid/html-lang-valid.js
@@ -3,12 +3,18 @@ describe('html-lang-valid test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		window.addEventListener('load', function () {
-			axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['html-lang-valid'] } }, function (r) {
+		function start() {
+			axe.run({ runOnly: { type: 'rule', values: ['html-lang-valid'] } }, function (err, r) {
+				assert.isNull(err);
 				results = r;
 				done();
 			});
-		});
+		}
+		if (document.readyState !== 'complete') {
+			window.addEventListener('load', start);
+		} else {
+			start();
+		}
 	});
 
 	describe('violations', function () {
diff --git a/test/integration/full/jquery/a11ycheck-object-include.html b/test/integration/full/jquery/a11ycheck-include-exclude.html
similarity index 93%
rename from test/integration/full/jquery/a11ycheck-object-include.html
rename to test/integration/full/jquery/a11ycheck-include-exclude.html
index d70ebaf699..114c8d2983 100644
--- a/test/integration/full/jquery/a11ycheck-object-include.html
+++ b/test/integration/full/jquery/a11ycheck-include-exclude.html
@@ -30,7 +30,7 @@
 	</div>
 <div id="mocha"></div>
 <script src="/node_modules/jquery/dist/jquery.js"></script>
-<script src="a11ycheck-object-include.js"></script>
+<script src="a11ycheck-include-exclude.js"></script>
 <script src="/test/integration/adapter.js"></script>
 </body>
 </html>
diff --git a/test/integration/full/jquery/a11ycheck-include-exclude.js b/test/integration/full/jquery/a11ycheck-include-exclude.js
new file mode 100644
index 0000000000..d50fb9ac48
--- /dev/null
+++ b/test/integration/full/jquery/a11ycheck-include-exclude.js
@@ -0,0 +1,29 @@
+/*global $ */
+
+describe('jQuery object with a11yCheck', function () {
+	'use strict';
+
+	var config = { runOnly: { type: 'rule', values: ['aria-roles'] } };
+
+	describe('include', function() {
+		it('should find violations', function (done) {
+			var target = $('#target')[0];
+			axe.a11yCheck({ include: [target] }, config, function (results) {
+				assert.lengthOf(results.violations, 1, 'violations');
+				assert.lengthOf(results.passes, 0, 'passes');
+				done();
+			});
+		});
+	});
+
+	describe('exclude', function() {
+		it('should find no violations', function (done) {
+			var target = $('#target')[0];
+			axe.a11yCheck({ exclude: [target] }, config, function (results) {
+				assert.lengthOf(results.violations, 0, 'violations');
+				assert.lengthOf(results.passes, 0, 'passes');
+				done();
+			});
+		});
+	});
+});
diff --git a/test/integration/full/jquery/a11ycheck-object-exclude.html b/test/integration/full/jquery/a11ycheck-object-exclude.html
deleted file mode 100644
index 4a25faf3db..0000000000
--- a/test/integration/full/jquery/a11ycheck-object-exclude.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<title>jQuery exclude test</title>
-	<meta charset="utf8">
-	<link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
-	<script src="/node_modules/mocha/mocha.js"></script>
-	<script src="/node_modules/chai/chai.js"></script>
-	<script src="/axe.js"></script>
-	<script>
-		mocha.setup({
-			timeout: 10000,
-			ui: 'bdd'
-		});
-		var assert = chai.assert;
-	</script>
-</head>
-<body>
-	<div id="fixture">
-		<div id="target">
-			<ol role="dinosaur">
-			  <div>
-					<a href="#somethin">Stuff</a>
-				</div>
-			</ol>
-			<ul role="mary-poppins">
-				<span>Different stuff</span>
-			</ul>
-		</div>
-	</div>
-<div id="mocha"></div>
-<script src="/node_modules/jquery/dist/jquery.js"></script>
-<script src="a11ycheck-object-exclude.js"></script>
-<script src="/test/integration/adapter.js"></script>
-</body>
-</html>
diff --git a/test/integration/full/jquery/a11ycheck-object-exclude.js b/test/integration/full/jquery/a11ycheck-object-exclude.js
deleted file mode 100644
index 9e1507812b..0000000000
--- a/test/integration/full/jquery/a11ycheck-object-exclude.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*global $ */
-
-describe('jQuery object as a11yCheck context', function () {
-	'use strict';
-	it('should find no violations', function (done) {
-		var target = $('#target')[0];
-		axe.a11yCheck({ exclude: [target] }, {}, function (results) {
-			assert.lengthOf(results.violations, 0, 'violations');
-			assert.lengthOf(results.passes, 11, 'passes');
-			done();
-		});
-	});
-});
diff --git a/test/integration/full/jquery/a11ycheck-object-include.js b/test/integration/full/jquery/a11ycheck-object-include.js
deleted file mode 100644
index 2e15f1651f..0000000000
--- a/test/integration/full/jquery/a11ycheck-object-include.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*global $ */
-
-describe('jQuery object as a11yCheck context', function () {
-	'use strict';
-	it('should find violations', function (done) {
-		var target = $('#target')[0];
-		axe.a11yCheck({ include: [target] }, {}, function (results) {
-			assert.lengthOf(results.violations, 1, 'violations');
-			assert.lengthOf(results.passes, 7, 'passes');
-			done();
-		});
-	});
-});
diff --git a/test/integration/full/jquery/a11ycheck-object.js b/test/integration/full/jquery/a11ycheck-object.js
index 0ec5a2ecfd..9989f4d4aa 100644
--- a/test/integration/full/jquery/a11ycheck-object.js
+++ b/test/integration/full/jquery/a11ycheck-object.js
@@ -2,11 +2,12 @@
 
 describe('jQuery object as a11yCheck context', function () {
 	'use strict';
+	var config = { runOnly: { type: 'rule', values: ['aria-roles'] } };
 	it('should find no violations', function (done) {
 		var fixture = $('#fixture');
-		axe.a11yCheck(fixture, {}, function (results) {
+		axe.a11yCheck(fixture, config, function (results) {
 			assert.lengthOf(results.violations, 0, 'violations');
-			assert.lengthOf(results.passes, 8, 'passes');
+			assert.lengthOf(results.passes, 1, 'passes');
 			done();
 		});
 	});
diff --git a/test/integration/full/list/li-role.js b/test/integration/full/list/li-role.js
index 83409cc551..05c5295deb 100644
--- a/test/integration/full/list/li-role.js
+++ b/test/integration/full/list/li-role.js
@@ -2,7 +2,8 @@
 describe('li overriden with ARIA role', function () {
 	'use strict';
 	it('should find no matching violations and one pass', function (done) {
-		axe.a11yCheck('#fixture', { runOnly: { type: 'rule', values: ['listitem'] } }, function (results) {
+		axe.run('#fixture', { runOnly: { type: 'rule', values: ['listitem'] } }, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 0, 'violations');
 			assert.lengthOf(results.passes, 1, 'passes');
 			assert.lengthOf(results.passes[0].nodes, 1, 'ARIA container');
diff --git a/test/integration/full/list/list-role.js b/test/integration/full/list/list-role.js
index 98f2794512..96857d3c2d 100644
--- a/test/integration/full/list/list-role.js
+++ b/test/integration/full/list/list-role.js
@@ -2,7 +2,8 @@
 describe('list overriden with ARIA role', function () {
 	'use strict';
 	it('should find no matches', function (done) {
-		axe.a11yCheck('#fixture', { runOnly: { type: 'rule', values: ['list'] } }, function (results) {
+		axe.run('#fixture', { runOnly: { type: 'rule', values: ['list'] } }, function (err, results) {
+			assert.isNull(err);
 			assert.lengthOf(results.violations, 0, 'violations');
 			assert.lengthOf(results.passes, 0, 'passes');
 			done();
diff --git a/test/integration/full/region/region-fail.js b/test/integration/full/region/region-fail.js
index 849abff84f..8b48b64792 100644
--- a/test/integration/full/region/region-fail.js
+++ b/test/integration/full/region/region-fail.js
@@ -2,7 +2,8 @@ describe('region fail test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['region'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['region'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/region/region-pass.js b/test/integration/full/region/region-pass.js
index d0a7ee79ee..7fb0c6c18b 100644
--- a/test/integration/full/region/region-pass.js
+++ b/test/integration/full/region/region-pass.js
@@ -2,7 +2,8 @@ describe('region pass test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['region'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['region'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/skip-link/skip-link-fail.js b/test/integration/full/skip-link/skip-link-fail.js
index 8cea5c894e..cf4b18f9c1 100644
--- a/test/integration/full/skip-link/skip-link-fail.js
+++ b/test/integration/full/skip-link/skip-link-fail.js
@@ -2,7 +2,8 @@ describe('skip link fail test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['skip-link'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['skip-link'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/skip-link/skip-link-pass.js b/test/integration/full/skip-link/skip-link-pass.js
index 170b41f97e..ef0420d36f 100644
--- a/test/integration/full/skip-link/skip-link-pass.js
+++ b/test/integration/full/skip-link/skip-link-pass.js
@@ -2,7 +2,8 @@ describe('skip link pass test', function () {
 	'use strict';
 	var results;
 	before(function (done) {
-		axe.a11yCheck(document, { runOnly: { type: 'rule', values: ['skip-link'] } }, function (r) {
+		axe.run({ runOnly: { type: 'rule', values: ['skip-link'] } }, function (err, r) {
+			assert.isNull(err);
 			results = r;
 			done();
 		});
diff --git a/test/integration/full/umd/umd-define.html b/test/integration/full/umd/umd-define.html
index 9b526a719f..d188ec57af 100644
--- a/test/integration/full/umd/umd-define.html
+++ b/test/integration/full/umd/umd-define.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>Skip-Link Test</title>
+<title>UMD define Test</title>
 <link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
 <script src="/node_modules/mocha/mocha.js"></script>
 <script src="/node_modules/chai/chai.js"></script>
diff --git a/test/integration/full/umd/umd-module-exports.html b/test/integration/full/umd/umd-module-exports.html
index 0787a1198b..4a820602d0 100644
--- a/test/integration/full/umd/umd-module-exports.html
+++ b/test/integration/full/umd/umd-module-exports.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>Skip-Link Test</title>
+<title>UMD module.exports Test</title>
 <link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
 <script src="/node_modules/mocha/mocha.js"></script>
 <script src="/node_modules/chai/chai.js"></script>
diff --git a/test/integration/full/umd/umd-window.html b/test/integration/full/umd/umd-window.html
index 109c37e0a3..8440012f56 100644
--- a/test/integration/full/umd/umd-window.html
+++ b/test/integration/full/umd/umd-window.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>Skip-Link Test</title>
+<title>UMD window.axe Test</title>
 <link rel="stylesheet" type="text/css" href="/node_modules/mocha/mocha.css" />
 <script src="/node_modules/mocha/mocha.js"></script>
 <script src="/node_modules/chai/chai.js"></script>
diff --git a/test/integration/rules/color-contrast/color-contrast.html b/test/integration/rules/color-contrast/color-contrast.html
index 6d18554ee0..ff6b960879 100644
--- a/test/integration/rules/color-contrast/color-contrast.html
+++ b/test/integration/rules/color-contrast/color-contrast.html
@@ -6,13 +6,9 @@
 <div id="fail2" style="background-color: gray; color: white; font-size: 8px;">This is a fail.</div>
 <div id="fail3" style="background-color: yellow; color: white; font-size: 40px;">This is a fail.</div>
 <div style="background-color: black;"><div style="background-color: rgba(255, 255, 255, 0.1); color: white" id="pass5">Pass.</div></div>
-<div style="background-color: rgba(255, 255, 255, 0.1); color: white" id="pass6">Pass by default.</div>
 
 <div style="background-color: white;"><div style="background-color: rgba(255, 255, 255, 0.1); color: white" id="fail4">Fail.</div></div>
-<div style="background-color: white; height: 20px; width: 80px;"><div id="pass7" style="color: white; height: 40px; width: 60px;">Hi</div></div>
-<div style="background-color: white; height: 60px; width: 40px;"><div id="pass8" style="color: white; height: 40px; width: 60px;">Hi</div></div>
 <div style="background-color: white; height: 60px; width: 80px;"><div id="fail5" style="color: white; height: 40px; width: 60px;">Hi</div></div>
-<div style="background-color: white; height: 60px; width: 80px;"><div id="pass9" style="margin-left: 80px; color: white; height: 40px; width: 60px;">Hi</div></div>
 <div style="background-color: white"><div id="fail6" style="opacity: 0.1; background-color: white; color: black">This is a fail.</div></div>
 <div style="background-color: white; height: 60px; width: 80px; overflow: scroll"><div id="fail7" style="margin-left: 80px; color: white; height: 80px; width: 90px;">Hi</div></div>
 
@@ -35,7 +31,6 @@
 <input id="ignore0" style="background: #000; color: #000" value="hello" type="hidden">
 <input id="ignore1" style="background: #000; color: #000" value="hello" type="radio">
 <input id="ignore2" style="background: #000; color: #000" value="hello" type="checkbox">
-<input id="ignore3" style="background: #000; color: #000" value="hello" type="range">
 <input id="ignore4" style="background: #000; color: #000" value="hello" type="hidden">
 <select id="ignore5" style="background: #000; color: #000"></select>
 <div id="ignore6" style="color: yellow; width: 100px; overflow: hidden; text-indent: 200px; background-color: white;">text</div>
@@ -48,3 +43,8 @@
 <div id="disabled2">Hello</div>
 <input aria-labelledby="disabled2" disabled>
 <div id="disabled3" style="background: #000; color: #000" role="alert" aria-disabled="true">hello</div>
+
+<div style="background-color: rgba(255, 255, 255, 0.1); color: white" id="canttell1">Pass by default.</div>
+<div style="background-color: white; height: 20px; width: 80px;"><div id="canttell2" style="color: white; height: 40px; width: 60px;">Hi</div></div>
+<div style="background-color: white; height: 60px; width: 40px;"><div id="canttell3" style="color: white; height: 40px; width: 60px;">Hi</div></div>
+<div style="background-color: white; height: 60px; width: 80px;"><div id="canttell4" style="margin-left: 80px; color: white; height: 40px; width: 60px;">Hi</div></div>
diff --git a/test/integration/rules/color-contrast/color-contrast.json b/test/integration/rules/color-contrast/color-contrast.json
index 87d9ec2a9d..ee6cd7a3b5 100644
--- a/test/integration/rules/color-contrast/color-contrast.json
+++ b/test/integration/rules/color-contrast/color-contrast.json
@@ -27,10 +27,12 @@
 		["#pass2"],
 		["#pass3"],
 		["#pass4"],
-		["#pass5"],
-		["#pass6"],
-		["#pass7"],
-		["#pass8"],
-		["#pass9"]
+		["#pass5"]
+	],
+	"incomplete": [
+		["#canttell1"],
+		["#canttell2"],
+		["#canttell3"],
+		["#canttell4"]
 	]
 }
diff --git a/test/integration/rules/frame-title-unique/frame-title-unique.html b/test/integration/rules/frame-title-unique/frame-title-unique.html
new file mode 100644
index 0000000000..c31ce820ad
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frame-title-unique.html
@@ -0,0 +1,5 @@
+
+<iframe src="frame-title-unique/frames/level1.html" id="ignore1"></iframe>
+<iframe src="frame-title-unique/frames/level1a.html" title="Duplicated" id="violation1"></iframe>
+<iframe src="frame-title-unique/frames/level1a.html" title="Duplicated" id="violation2"></iframe>
+<iframe src="frame-title-unique/frames/level1a.html" title="I'm an individual" id="pass2"></iframe>
diff --git a/test/integration/rules/frame-title-unique/frame-title-unique.json b/test/integration/rules/frame-title-unique/frame-title-unique.json
new file mode 100644
index 0000000000..8732314f76
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frame-title-unique.json
@@ -0,0 +1,12 @@
+{
+	"description": "frame-title-unique test",
+	"rule": "frame-title-unique",
+	"violations": [
+		["#violation1"],
+		["#violation2"]
+	],
+	"passes": [
+		["#ignore1", "#pass1"],
+		["#pass2"]
+	]
+}
diff --git a/test/integration/rules/frame-title-unique/frames/level1.html b/test/integration/rules/frame-title-unique/frames/level1.html
new file mode 100644
index 0000000000..60eda8b3f9
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frames/level1.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+	<title>Hello</title>
+	<meta charset="utf8">
+	<script src="/axe.js"></script>
+</head>
+<body>
+	<iframe src="level2.html" title="  " id="ignore2"></iframe>
+	<iframe src="level2-a.html" title="hello" id="pass1"></iframe>
+</body>
+</html>
diff --git a/test/integration/rules/frame-title-unique/frames/level1a.html b/test/integration/rules/frame-title-unique/frames/level1a.html
new file mode 100644
index 0000000000..3e0c2dcba3
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frames/level1a.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+	<title>Duplicated</title>
+	<meta charset="utf8">
+	<script src="/axe.js"></script>
+</head>
+<body>
+<p>Hi</p>
+</body>
+</html>
diff --git a/test/integration/rules/frame-title-unique/frames/level2-a.html b/test/integration/rules/frame-title-unique/frames/level2-a.html
new file mode 100644
index 0000000000..eaaca2da70
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frames/level2-a.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+	<title>Hello</title>
+	<meta charset="utf8">
+	<script src="/axe.js"></script>
+</head>
+<body>
+	Hi
+</body>
+</html>
diff --git a/test/integration/rules/frame-title-unique/frames/level2.html b/test/integration/rules/frame-title-unique/frames/level2.html
new file mode 100644
index 0000000000..31c14a07b3
--- /dev/null
+++ b/test/integration/rules/frame-title-unique/frames/level2.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf8">
+	<script src="/axe.js"></script>
+</head>
+<body>
+</body>
+</html>
diff --git a/test/integration/rules/frame-title/frame-title.html b/test/integration/rules/frame-title/frame-title.html
index 43580e238a..4be9093304 100644
--- a/test/integration/rules/frame-title/frame-title.html
+++ b/test/integration/rules/frame-title/frame-title.html
@@ -1,4 +1,11 @@
 
 <iframe src="frame-title/frames/level1.html" id="violation1"></iframe>
-<iframe src="frame-title/frames/level1a.html" title="Duplicated" id="violation3"></iframe>
-<iframe src="frame-title/frames/level1a.html" title="Duplicated" id="violation4"></iframe>
+<iframe src="frame-title/frames/level1a.html" title="Duplicated" id="pass2"></iframe>
+<iframe src="frame-title/frames/level1a.html" title="Duplicated" id="pass3"></iframe>
+<iframe src="frame-title/frames/level1a.html" aria-label="some label" id="pass4"></iframe>
+<iframe src="frame-title/frames/level1a.html" aria-label="" id="violation3"></iframe>
+
+<div id="mylabel">label!</div>
+<iframe src="frame-title/frames/level1a.html" aria-labelledby="mylabel" id="pass5"></iframe>
+<iframe src="frame-title/frames/level1a.html" id="pass6" role="presentation"></iframe>
+<iframe src="frame-title/frames/level1a.html" id="pass7" role="none"></iframe>
diff --git a/test/integration/rules/frame-title/frame-title.json b/test/integration/rules/frame-title/frame-title.json
index c9c78e831b..6fb5d22686 100644
--- a/test/integration/rules/frame-title/frame-title.json
+++ b/test/integration/rules/frame-title/frame-title.json
@@ -3,11 +3,16 @@
 	"rule": "frame-title",
 	"violations": [
 		["#violation1"],
-		["#violation3"],
-		["#violation4"],
-		["#violation1", "#violation2"]
+		["#violation1", "#violation2"],
+		["#violation3"]
 	],
 	"passes": [
-		["#violation1", "#pass1"]
+		["#violation1", "#pass1"],
+		["#pass2"],
+		["#pass3"],
+		["#pass4"],
+		["#pass5"],
+		["#pass6"],
+		["#pass7"]
 	]
 }
diff --git a/test/integration/rules/frame-title/frames/level1.html b/test/integration/rules/frame-title/frames/level1.html
index da443b8044..78875c645e 100644
--- a/test/integration/rules/frame-title/frames/level1.html
+++ b/test/integration/rules/frame-title/frames/level1.html
@@ -6,7 +6,7 @@
 	<script src="/axe.js"></script>
 </head>
 <body>
-	<iframe src="level2.html" id="violation2"></iframe>
+	<iframe src="level2.html" title="" id="violation2"></iframe>
 	<iframe src="level2-a.html" title="hello" id="pass1"></iframe>
 </body>
 </html>
diff --git a/test/integration/rules/runner.js b/test/integration/rules/runner.js
index 688f566e34..a62655d144 100644
--- a/test/integration/rules/runner.js
+++ b/test/integration/rules/runner.js
@@ -5,7 +5,8 @@
 	function flattenResult(results) {
 		return {
 			passes: results.passes[0],
-			violations: results.violations[0]
+			violations: results.violations[0],
+			incomplete: results.incomplete[0]
 		};
 	}
 
@@ -97,7 +98,8 @@
 					before(function (done) {
 						fixture.innerHTML = test.content;
 						waitForFrames(fixture, function () {
-							axe.a11yCheck(fixture, { runOnly: { type: 'rule', values: [ruleId]}}, function (r) {
+							axe.run(fixture, { runOnly: { type: 'rule', values: [ruleId]}}, function (err, r) {
+								assert.isNull(err);
 								results = flattenResult(r);
 								done();
 							});
@@ -106,6 +108,9 @@
 					});
 					runTest(test, 'passes');
 					runTest(test, 'violations');
+					if (test.incomplete) {
+						runTest(test, 'incomplete');
+					}
 				});
 			});
 		});
diff --git a/test/mock/frames/recursive.html b/test/mock/frames/recursive.html
deleted file mode 100644
index acd088068c..0000000000
--- a/test/mock/frames/recursive.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-<script src="../../../axe.js"></script>
-<script>
-	axe._load({
-		rules: [{
-			id: 'iframe',
-			selector: 'iframe',
-			any: ['iframe']
-		}],
-		checks: [{
-			id: 'iframe',
-			evaluate: function () {
-				return true;
-			}
-		}],
-		messages: {}
-	});
-</script>
-</head>
-<body>
-	<h1>Recursive iframe</h1>
-	<iframe src="nested1.html">
-</body>
-</html>
diff --git a/test/mock/frames/rule-error.html b/test/mock/frames/rule-error.html
new file mode 100644
index 0000000000..6231f8da3a
--- /dev/null
+++ b/test/mock/frames/rule-error.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html>
+<head>
+	<title>Test Rule error</title>
+	<script src="../../../axe.js"></script>
+	<script>
+		axe._load({
+			rules: [{
+				id: 'incomplete-1',
+				selector: '*',
+				none: ['undeffed']
+			}, {
+				id: 'incomplete-2',
+				selector: '*',
+				none: ['thrower']
+			}],
+			checks: [{
+				id: 'undeffed',
+				evaluate: function () {
+					return undefined;
+				}
+			}, {
+				id: 'thrower',
+				evaluate: function () {
+					throw new Error('Check failed to complete');
+				}
+			}]
+		});
+	</script>
+</head>
+<body>
+  <h1 class="nogo">header 1</h1>
+</body>
+</html>
diff --git a/test/playground.html b/test/playground.html
index 42dfb26de1..2b0e239db4 100644
--- a/test/playground.html
+++ b/test/playground.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <title>O hai</title>
 <script src="/axe.js"></script>
-<iframe src="mock/frames/responder.html" id="frame1"></iframe>
 <div id="dupe"></div>
 <div id="dupe"></div>
 <script>
 
-document.getElementById('frame1').addEventListener('load', function (e) {
-	window.frameWin = e.target.contentWindow;
-	window.respondable  = axe.utils.respondable;
-});
+window.addEventListener('load' , function () {
+	axe.a11yCheck(document, {}, function (res) {
+		console.log(res);
+	});
+})
 
 </script>
\ No newline at end of file
diff --git a/test/rule-matches/aria-allowed-attr-matches.js b/test/rule-matches/aria-allowed-attr-matches.js
new file mode 100644
index 0000000000..c48b8acf76
--- /dev/null
+++ b/test/rule-matches/aria-allowed-attr-matches.js
@@ -0,0 +1,75 @@
+describe('aria-allowed-attr-matches', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+	var rule;
+
+	beforeEach(function () {
+		rule = axe._audit.rules.find(function (rule) {
+			return rule.id === 'aria-allowed-attr';
+		});
+	});
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('is a function', function () {
+		assert.isFunction(rule.matches);
+	});
+
+	it('should return false on elements with no role or no implicit role', function () {
+		var orig = axe.commons.aria.implicitRole;
+		axe.commons.aria.implicitRole = function (nd) {
+			assert.equal(nd, div);
+			return null;
+		};
+		var div = document.createElement('div');
+		fixture.appendChild(div);
+
+		assert.isFalse(rule.matches(div));
+		axe.commons.aria.implicitRole = orig;
+	});
+
+	it('should return false on elements that have no allowed attributes', function () {
+		var orig = axe.commons.aria.allowedAttr;
+		axe.commons.aria.allowedAttr = function (role) {
+			assert.equal(role, 'button');
+			return null;
+		};
+		var div = document.createElement('div');
+		div.setAttribute('role', 'button');
+		fixture.appendChild(div);
+
+		assert.isFalse(rule.matches(div));
+		axe.commons.aria.allowedAttr = orig;
+	});
+
+	it('should return false on elements that have a role but no aria attributes', function () {
+		var div = document.createElement('div');
+		div.setAttribute('role', 'button');
+		fixture.appendChild(div);
+
+		assert.isFalse(rule.matches(div));
+	});
+
+
+	it('should return true on elements that have a role', function () {
+		var div = document.createElement('div');
+		div.setAttribute('role', 'button');
+		div.setAttribute('aria-cats', 'meow');
+		fixture.appendChild(div);
+
+		assert.isTrue(rule.matches(div));
+	});
+
+	it('should return true on elements that have an implicit role', function () {
+		var div = document.createElement('a');
+		div.setAttribute('href', '#monkeys');
+		div.setAttribute('aria-cats', 'meow');
+		fixture.appendChild(div);
+
+		assert.isTrue(rule.matches(div));
+	});
+
+});
\ No newline at end of file
diff --git a/test/rule-matches/aria-has-attr-matches.js b/test/rule-matches/aria-has-attr-matches.js
new file mode 100644
index 0000000000..48421e9068
--- /dev/null
+++ b/test/rule-matches/aria-has-attr-matches.js
@@ -0,0 +1,36 @@
+describe('aria-has-attr-matches', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+	var rule;
+
+	beforeEach(function () {
+		rule = axe._audit.rules.find(function (rule) {
+			return rule.id === 'aria-valid-attr-value';
+		});
+	});
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('is a function', function () {
+		assert.isFunction(rule.matches);
+	});
+
+	it('should return false if an element has no attributes', function () {
+		var div = document.createElement('div');
+		assert.isFalse(rule.matches(div));
+	});
+	it('should return false if an element has no ARIA attributes', function () {
+		var div = document.createElement('div');
+		div.id = 'monkeys';
+		assert.isFalse(rule.matches(div));
+	});
+	it('should return true if an element has ARIA attributes', function () {
+		var div = document.createElement('div');
+		div.setAttribute('aria-bats', 'monkeys');
+		assert.isTrue(rule.matches(div));
+	});
+
+});
\ No newline at end of file
diff --git a/test/rule-matches/color-contrast-matches.js b/test/rule-matches/color-contrast-matches.js
new file mode 100644
index 0000000000..9b416c1b2d
--- /dev/null
+++ b/test/rule-matches/color-contrast-matches.js
@@ -0,0 +1,196 @@
+describe('color-contrast-matches', function () {
+	'use strict';
+
+	var fixture = document.getElementById('fixture');
+	var rule;
+
+	beforeEach(function () {
+		rule = axe._audit.rules.find(function (rule) {
+			return rule.id === 'color-contrast';
+		});
+	});
+
+	afterEach(function () {
+		fixture.innerHTML = '';
+	});
+
+	it('is a function', function () {
+		assert.isFunction(rule.matches);
+	});
+
+	it('should not match when there is no text', function () {
+		fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
+			' </div>';
+		var target = fixture.querySelector('#target');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should match when there is text', function () {
+		fixture.innerHTML = '<div style="color: yellow; background-color: white;" id="target">' +
+			'My text</div>';
+		var target = fixture.querySelector('#target');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should not match when there is text that is out of the container', function () {
+		fixture.innerHTML = '<div style="color: yellow; text-indent: -9999px; background-color: white;" id="target">' +
+			'My text</div>';
+		var target = fixture.querySelector('#target');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match when there is text that is out of the container with overflow hidden', function () {
+		fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: hidden; text-indent: 200px; background-color: white;" id="target">' +
+			'text</div>';
+		var target = fixture.querySelector('#target');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should match when there is text that is in the scroll reach of container', function () {
+		fixture.innerHTML = '<div style="color: yellow; width: 100px; overflow: scroll; text-indent: 200px; background-color: white;" id="target">' +
+			'text</div>';
+		var target = fixture.querySelector('#target');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should match when there is text that is only partially out of the container', function () {
+		fixture.innerHTML = '<div style="color: yellow; text-indent: -20px; background-color: white;" id="target">' +
+			'My text</div>';
+		var target = fixture.querySelector('#target');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should match <input type="text">', function () {
+		fixture.innerHTML = '<input type="text">';
+		var target = fixture.querySelector('input');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should not match <input type="hidden">', function () {
+		fixture.innerHTML = '<input type="hidden">';
+		var target = fixture.querySelector('input');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match <input type="checkbox">', function () {
+		fixture.innerHTML = '<input type="checkbox">';
+		var target = fixture.querySelector('input');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match <input type="radio">', function () {
+		fixture.innerHTML = '<input type="radio">';
+		var target = fixture.querySelector('input');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match <input type="color">', function () {
+		fixture.innerHTML = '<input type="color">';
+		var target = fixture.querySelector('input');
+		// Some browsers will fallback to type=text for unknown input types (looking at you IE)
+		if (target.type === 'color') {
+			assert.isFalse(rule.matches(target));
+		}
+	});
+
+	it('should not match <input type="range">', function () {
+		fixture.innerHTML = '<input type="range">';
+		var target = fixture.querySelector('input');
+		// Some browsers will fallback to type=text for unknown input types (looking at you IE)
+		if (target.type === 'range') {
+			assert.isFalse(rule.matches(target));
+		}
+	});
+
+	it('should match <select> with options', function () {
+		fixture.innerHTML = '<select><option>Hello</option></select>';
+		var target = fixture.querySelector('select');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should not match <select> with no options', function () {
+		fixture.innerHTML = '<select></select>';
+		var target = fixture.querySelector('select');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should match <textarea>', function () {
+		fixture.innerHTML = '<textarea></textarea>';
+		var target = fixture.querySelector('textarea');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should not match <option>', function () {
+		fixture.innerHTML = '<select><option>hi</option></select>';
+		var target = fixture.querySelector('option');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match inputs that are disabled', function () {
+		fixture.innerHTML = '<input type="text" disabled>';
+		var target = fixture.querySelector('input');
+		assert.isFalse(rule.matches(target));
+
+	});
+
+	it('should not match <textarea disabled>', function () {
+		fixture.innerHTML = '<textarea disabled></textarea>';
+		var target = fixture.querySelector('textarea');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match <select> with options', function () {
+		fixture.innerHTML = '<select disabled><option>Hello</option></select>';
+		var target = fixture.querySelector('select');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should match <button>', function () {
+		fixture.innerHTML = '<button>hi</button>';
+		var target = fixture.querySelector('button');
+		assert.isTrue(rule.matches(target));
+	});
+
+	it('should not match <button disabled>', function () {
+		fixture.innerHTML = '<button disabled>hi</button>';
+		var target = fixture.querySelector('button');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match <input type=image>', function () {
+		fixture.innerHTML = '<input type="image">';
+		var target = fixture.querySelector('input');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match a disabled input\'s label - explicit label', function () {
+		fixture.innerHTML = '<label for="t1">Test</label><input type="text" id="t1" disabled>';
+		var target = fixture.querySelector('label');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match a disabled input\'s label - implicit label (input)', function () {
+		fixture.innerHTML = '<label>Test<input type="text" disabled></label>';
+		var target = fixture.querySelector('label');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match a disabled input\'s label - implicit label (textarea)', function () {
+		fixture.innerHTML = '<label>Test<textarea disabled>Hi</textarea></label>';
+		var target = fixture.querySelector('label');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match a disabled input\'s label - implicit label (select)', function () {
+		fixture.innerHTML = '<label>Test<select disabled><option>Test</option></select></label>';
+		var target = fixture.querySelector('label');
+		assert.isFalse(rule.matches(target));
+	});
+
+	it('should not match a disabled input\'s label - aria-labelledby', function () {
+		fixture.innerHTML = '<div id="t1">Test</div><input type="text" aria-labelledby="bob t1 fred" disabled>';
+		var target = fixture.querySelector('div');
+		assert.isFalse(rule.matches(target));
+	});
+
+});
\ No newline at end of file
diff --git a/typings/axe-core/axe-core-tests.ts b/typings/axe-core/axe-core-tests.ts
index 1889b37dea..4d613954cd 100644
--- a/typings/axe-core/axe-core-tests.ts
+++ b/typings/axe-core/axe-core-tests.ts
@@ -3,6 +3,21 @@ import * as axe from '../../axe'
 var context:any = document
 var $fixture:any = {}
 
+axe.run(context, {}, (error: Error, results: axe.AxeResults) => {
+	if (error) {
+		console.log(error);
+	}
+	console.log(results.passes.length);
+	console.log(results.incomplete.length);
+	console.log(results.inapplicable.length);
+	console.log(results.violations.length);
+	console.log(results.violations[0].nodes[0].failureSummary)
+});
+
+axe.run().then(function(done:any) {
+	done();
+});
+
 // axe.a11yCheck config
 axe.a11yCheck(context, {}, (results: axe.AxeResults) => {
 	// axe's results object

From 77422014a1ccf1bc278bbf93e703ac46f53d7cb5 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 13 Dec 2016 13:42:14 -0800
Subject: [PATCH 30/40] chore: update changelog for 2.1.7

---
 CHANGELOG | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f1d5c1839c..88fbb1d361 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,4 +34,19 @@ v2.0.5:
 		- Support for UMD pattern
 		- Adds 508 tagging for table rules
 		- Fixes race condition for iframes
-		- Exclude actual nodes from array checking
\ No newline at end of file
+		- Exclude actual nodes from array checking
+v2.0.7:
+	date: 2016-09-28
+	changes:
+		- Add TypeScript definiton v1
+v2.1.7:
+	date: 2016-12-13
+	changes:
+		- Add promise-based axe.run API method in favor of axe.a11yCheck
+		- Move TypeScript definition to root of project
+		- Add Inapplicable and Can't Tell results
+		- New rule: frame-title-unique
+		- Improvements to table rules: td-has-header, th-has-data-cells
+		- Color contrast rule performance improvements using polyfilled elementsFromPoint
+		- Add better support for implicit roles
+		- DQElement supports xPath

From 68f6fca8218bc9cdfe87cefd10cb0bef6fe3719c Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Tue, 13 Dec 2016 13:46:37 -0800
Subject: [PATCH 31/40] chore: update bower.json for 2.1.7

---
 CHANGELOG  |  2 +-
 bower.json | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 88fbb1d361..b43b1a6d70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,7 +38,7 @@ v2.0.5:
 v2.0.7:
 	date: 2016-09-28
 	changes:
-		- Add TypeScript definiton v1
+		- Add TypeScript definition v1
 v2.1.7:
 	date: 2016-12-13
 	changes:
diff --git a/bower.json b/bower.json
index effbd2b9c5..d169785e37 100644
--- a/bower.json
+++ b/bower.json
@@ -1,21 +1,47 @@
 {
   "name": "axe-core",
   "description": "Accessibility engine for automated Web UI testing",
-  "version": "2.0.8",
-  "authors": [
-    "David Sturley <david.sturley@deque.com>"
+  "version": "2.1.7",
+  "contributors": [
+    {
+      "name": "David Sturley",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Dylan Barrell",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Wilco Fiers",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Dian Fay",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    },
+    {
+      "name": "Marcy Sutton",
+      "organization": "Deque Systems, Inc.",
+      "url": "http://deque.com/"
+    }
   ],
   "repository": {
     "type" : "git",
     "url" : "https://github.com/dequelabs/axe-core.git"
   },
   "main": "axe.js",
+  "typings": "axe.d.ts",
   "license": "MPL-2.0",
   "ignore": [
     "**/.*",
     "node_modules",
     "test",
-    "build"
+    "build",
+    "typings"
   ],
   "devDependencies": {}
 }

From bea89545bcc33ca8e3303742c781928b280c40b6 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Tue, 13 Dec 2016 16:51:16 -0500
Subject: [PATCH 32/40] Update projects.md

Add reference to protractor accessibility plugin
---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 64bd1afb71..c7c2a5454c 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -20,3 +20,4 @@ Add your project/integration to this file and submit a pull request.
 16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
 17. [Axegrinder](https://github.com/claflamme/axegrinder)
 18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
+19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin}

From f99f05929ec60666a7fe17e29eddb63e9352ffa5 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Tue, 13 Dec 2016 16:51:36 -0500
Subject: [PATCH 33/40] Update projects.md

---
 doc/projects.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/projects.md b/doc/projects.md
index c7c2a5454c..1c933cec30 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -20,4 +20,4 @@ Add your project/integration to this file and submit a pull request.
 16. [Lighthouse](https://github.com/GoogleChrome/lighthouse)
 17. [Axegrinder](https://github.com/claflamme/axegrinder)
 18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
-19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin}
+19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin)

From f446ce80e377b325ea411a767da7b71647e71c96 Mon Sep 17 00:00:00 2001
From: Dylan Barrell <dylan@barrell.com>
Date: Wed, 14 Dec 2016 13:12:42 -0500
Subject: [PATCH 34/40] Update projects.md

Storybook addon
---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index 1c933cec30..b34e65c40b 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -21,3 +21,4 @@ Add your project/integration to this file and submit a pull request.
 17. [Axegrinder](https://github.com/claflamme/axegrinder)
 18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
 19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin)
+20. [Storybook accessibility addon](https://github.com/jbovenschen/storybook-addon-a11y)

From 52b098f871c42f1116200364748c5a5b74467768 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy.sutton@deque.com>
Date: Wed, 14 Dec 2016 15:14:46 -0800
Subject: [PATCH 35/40] chore: add Intern to list of axe projects

---
 doc/projects.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/projects.md b/doc/projects.md
index b34e65c40b..629cb9b6bc 100644
--- a/doc/projects.md
+++ b/doc/projects.md
@@ -22,3 +22,4 @@ Add your project/integration to this file and submit a pull request.
 18. [Ghost-Axe](https://www.npmjs.com/package/ghost-axe)
 19. [Protractor accessibility plugin](https://github.com/angular/protractor-accessibility-plugin)
 20. [Storybook accessibility addon](https://github.com/jbovenschen/storybook-addon-a11y)
+21. [Intern](https://github.com/theintern/intern-a11y)

From 1f7aa9eca3e0d50bcb88c8319f475b247800fdb6 Mon Sep 17 00:00:00 2001
From: Michael Fairchild <mfairchild365@gmail.com>
Date: Wed, 21 Dec 2016 13:47:59 -0600
Subject: [PATCH 36/40] If an element's right bound is == 0, it is still not
 'on the screen'

---
 lib/commons/dom/is-offscreen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/commons/dom/is-offscreen.js b/lib/commons/dom/is-offscreen.js
index e56fce4146..f2c5aaa68e 100644
--- a/lib/commons/dom/is-offscreen.js
+++ b/lib/commons/dom/is-offscreen.js
@@ -15,13 +15,13 @@ dom.isOffscreen = function (element) {
 	}
 
 	if (dir === 'ltr') {
-		if (coords.right < 0) {
+		if (coords.right <= 0) {
 			return true;
 		}
 	} else {
 
 		leftBoundary = Math.max(docElement.scrollWidth, dom.getViewportSize(window).width);
-		if (coords.left > leftBoundary) {
+		if (coords.left >= leftBoundary) {
 			return true;
 		}
 	}

From 21ad9deddb37295f260f0c2ad054a5008fa72852 Mon Sep 17 00:00:00 2001
From: Michael Fairchild <mfairchild365@gmail.com>
Date: Wed, 21 Dec 2016 14:00:05 -0600
Subject: [PATCH 37/40] Handle the edge case of a zero width element with a
 right bound of 0

This was causing some tests to fail
---
 lib/commons/dom/is-offscreen.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/commons/dom/is-offscreen.js b/lib/commons/dom/is-offscreen.js
index f2c5aaa68e..9515919fa5 100644
--- a/lib/commons/dom/is-offscreen.js
+++ b/lib/commons/dom/is-offscreen.js
@@ -13,6 +13,11 @@ dom.isOffscreen = function (element) {
 	if (coords.bottom < 0) {
 		return true;
 	}
+	
+	if (coords.left === 0 && coords.right === 0) {
+		//This is an edge case, an empty (zero-width) element that isn't positioned 'off screen'.
+		return false;
+	}
 
 	if (dir === 'ltr') {
 		if (coords.right <= 0) {

From ff1357f76fb26e5e849bf848f15f6c86c9db3a6f Mon Sep 17 00:00:00 2001
From: Michael Fairchild <mfairchild365@gmail.com>
Date: Wed, 21 Dec 2016 14:14:09 -0600
Subject: [PATCH 38/40] add tests

---
 test/commons/dom/is-offscreen.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/commons/dom/is-offscreen.js b/test/commons/dom/is-offscreen.js
index c4444a7ee0..3ff6b905b8 100644
--- a/test/commons/dom/is-offscreen.js
+++ b/test/commons/dom/is-offscreen.js
@@ -14,6 +14,20 @@ describe('dom.isOffscreen', function () {
 		assert.isTrue(axe.commons.dom.isOffscreen(el));
 	});
 
+	it('should detect elements positioned to but not beyond the left edge', function () {
+		fixture.innerHTML = '<div id="target" style="position: absolute; width: 50px; left: -50px;">Offscreen?</div>';
+		var el = document.getElementById('target');
+
+		assert.isTrue(axe.commons.dom.isOffscreen(el));
+	});
+
+	it('should not detect elements at the left edge with a zero width', function () {
+		fixture.innerHTML = '<div id="target" style="width: 0px; left: 0px;"></div>';
+		var el = document.getElementById('target');
+
+		assert.isFalse(axe.commons.dom.isOffscreen(el));
+	});
+
 	it('should detect elements positioned outside the top edge', function () {
 		fixture.innerHTML = '<div id="target" style="position: absolute; height: 50px; top: -51px;">Offscreen?</div>';
 		var el = document.getElementById('target');

From 64e9d47315a20ffc5ba78aaddbd2f79420c5e8b6 Mon Sep 17 00:00:00 2001
From: Michael Fairchild <mfairchild365@gmail.com>
Date: Wed, 21 Dec 2016 18:03:43 -0600
Subject: [PATCH 39/40] Include all language tags, not just two letter tags
 (#257)

* Include all language tags, not just two letter tags

* Add an integration test for language
---
 build/tasks/langs.js                          |    5 +-
 lib/checks/language/valid-lang.json           | 7933 ++++++++++++++++-
 .../rules/valid-lang/valid-lang.html          |    1 +
 .../rules/valid-lang/valid-lang.json          |    2 +-
 4 files changed, 7933 insertions(+), 8 deletions(-)

diff --git a/build/tasks/langs.js b/build/tasks/langs.js
index 7aa2592342..469f8dc4ad 100644
--- a/build/tasks/langs.js
+++ b/build/tasks/langs.js
@@ -74,9 +74,8 @@ module.exports = function (grunt) {
 					continue;
 				}
 				var lang = entry[1].replace('Subtag: ', '').trim();
-				if (lang.length === 2) { // only interested in main languages
-					langs.push(lang);
-				}
+				
+				langs.push(lang);
 			}
 			generateOutput(langs, check);
 		}).then(function () {
diff --git a/lib/checks/language/valid-lang.json b/lib/checks/language/valid-lang.json
index 514da617a8..edb99c8766 100644
--- a/lib/checks/language/valid-lang.json
+++ b/lib/checks/language/valid-lang.json
@@ -190,14 +190,7939 @@
   "yo",
   "za",
   "zh",
-  "zu"
+  "zu",
+  "aaa",
+  "aab",
+  "aac",
+  "aad",
+  "aae",
+  "aaf",
+  "aag",
+  "aah",
+  "aai",
+  "aak",
+  "aal",
+  "aam",
+  "aan",
+  "aao",
+  "aap",
+  "aaq",
+  "aas",
+  "aat",
+  "aau",
+  "aav",
+  "aaw",
+  "aax",
+  "aaz",
+  "aba",
+  "abb",
+  "abc",
+  "abd",
+  "abe",
+  "abf",
+  "abg",
+  "abh",
+  "abi",
+  "abj",
+  "abl",
+  "abm",
+  "abn",
+  "abo",
+  "abp",
+  "abq",
+  "abr",
+  "abs",
+  "abt",
+  "abu",
+  "abv",
+  "abw",
+  "abx",
+  "aby",
+  "abz",
+  "aca",
+  "acb",
+  "acd",
+  "ace",
+  "acf",
+  "ach",
+  "aci",
+  "ack",
+  "acl",
+  "acm",
+  "acn",
+  "acp",
+  "acq",
+  "acr",
+  "acs",
+  "act",
+  "acu",
+  "acv",
+  "acw",
+  "acx",
+  "acy",
+  "acz",
+  "ada",
+  "adb",
+  "add",
+  "ade",
+  "adf",
+  "adg",
+  "adh",
+  "adi",
+  "adj",
+  "adl",
+  "adn",
+  "ado",
+  "adp",
+  "adq",
+  "adr",
+  "ads",
+  "adt",
+  "adu",
+  "adw",
+  "adx",
+  "ady",
+  "adz",
+  "aea",
+  "aeb",
+  "aec",
+  "aed",
+  "aee",
+  "aek",
+  "ael",
+  "aem",
+  "aen",
+  "aeq",
+  "aer",
+  "aes",
+  "aeu",
+  "aew",
+  "aey",
+  "aez",
+  "afa",
+  "afb",
+  "afd",
+  "afe",
+  "afg",
+  "afh",
+  "afi",
+  "afk",
+  "afn",
+  "afo",
+  "afp",
+  "afs",
+  "aft",
+  "afu",
+  "afz",
+  "aga",
+  "agb",
+  "agc",
+  "agd",
+  "age",
+  "agf",
+  "agg",
+  "agh",
+  "agi",
+  "agj",
+  "agk",
+  "agl",
+  "agm",
+  "agn",
+  "ago",
+  "agp",
+  "agq",
+  "agr",
+  "ags",
+  "agt",
+  "agu",
+  "agv",
+  "agw",
+  "agx",
+  "agy",
+  "agz",
+  "aha",
+  "ahb",
+  "ahg",
+  "ahh",
+  "ahi",
+  "ahk",
+  "ahl",
+  "ahm",
+  "ahn",
+  "aho",
+  "ahp",
+  "ahr",
+  "ahs",
+  "aht",
+  "aia",
+  "aib",
+  "aic",
+  "aid",
+  "aie",
+  "aif",
+  "aig",
+  "aih",
+  "aii",
+  "aij",
+  "aik",
+  "ail",
+  "aim",
+  "ain",
+  "aio",
+  "aip",
+  "aiq",
+  "air",
+  "ais",
+  "ait",
+  "aiw",
+  "aix",
+  "aiy",
+  "aja",
+  "ajg",
+  "aji",
+  "ajn",
+  "ajp",
+  "ajt",
+  "aju",
+  "ajw",
+  "ajz",
+  "akb",
+  "akc",
+  "akd",
+  "ake",
+  "akf",
+  "akg",
+  "akh",
+  "aki",
+  "akj",
+  "akk",
+  "akl",
+  "akm",
+  "ako",
+  "akp",
+  "akq",
+  "akr",
+  "aks",
+  "akt",
+  "aku",
+  "akv",
+  "akw",
+  "akx",
+  "aky",
+  "akz",
+  "ala",
+  "alc",
+  "ald",
+  "ale",
+  "alf",
+  "alg",
+  "alh",
+  "ali",
+  "alj",
+  "alk",
+  "all",
+  "alm",
+  "aln",
+  "alo",
+  "alp",
+  "alq",
+  "alr",
+  "als",
+  "alt",
+  "alu",
+  "alv",
+  "alw",
+  "alx",
+  "aly",
+  "alz",
+  "ama",
+  "amb",
+  "amc",
+  "ame",
+  "amf",
+  "amg",
+  "ami",
+  "amj",
+  "amk",
+  "aml",
+  "amm",
+  "amn",
+  "amo",
+  "amp",
+  "amq",
+  "amr",
+  "ams",
+  "amt",
+  "amu",
+  "amv",
+  "amw",
+  "amx",
+  "amy",
+  "amz",
+  "ana",
+  "anb",
+  "anc",
+  "and",
+  "ane",
+  "anf",
+  "ang",
+  "anh",
+  "ani",
+  "anj",
+  "ank",
+  "anl",
+  "anm",
+  "ann",
+  "ano",
+  "anp",
+  "anq",
+  "anr",
+  "ans",
+  "ant",
+  "anu",
+  "anv",
+  "anw",
+  "anx",
+  "any",
+  "anz",
+  "aoa",
+  "aob",
+  "aoc",
+  "aod",
+  "aoe",
+  "aof",
+  "aog",
+  "aoh",
+  "aoi",
+  "aoj",
+  "aok",
+  "aol",
+  "aom",
+  "aon",
+  "aor",
+  "aos",
+  "aot",
+  "aou",
+  "aox",
+  "aoz",
+  "apa",
+  "apb",
+  "apc",
+  "apd",
+  "ape",
+  "apf",
+  "apg",
+  "aph",
+  "api",
+  "apj",
+  "apk",
+  "apl",
+  "apm",
+  "apn",
+  "apo",
+  "app",
+  "apq",
+  "apr",
+  "aps",
+  "apt",
+  "apu",
+  "apv",
+  "apw",
+  "apx",
+  "apy",
+  "apz",
+  "aqa",
+  "aqc",
+  "aqd",
+  "aqg",
+  "aql",
+  "aqm",
+  "aqn",
+  "aqp",
+  "aqr",
+  "aqt",
+  "aqz",
+  "arb",
+  "arc",
+  "ard",
+  "are",
+  "arh",
+  "ari",
+  "arj",
+  "ark",
+  "arl",
+  "arn",
+  "aro",
+  "arp",
+  "arq",
+  "arr",
+  "ars",
+  "art",
+  "aru",
+  "arv",
+  "arw",
+  "arx",
+  "ary",
+  "arz",
+  "asa",
+  "asb",
+  "asc",
+  "asd",
+  "ase",
+  "asf",
+  "asg",
+  "ash",
+  "asi",
+  "asj",
+  "ask",
+  "asl",
+  "asn",
+  "aso",
+  "asp",
+  "asq",
+  "asr",
+  "ass",
+  "ast",
+  "asu",
+  "asv",
+  "asw",
+  "asx",
+  "asy",
+  "asz",
+  "ata",
+  "atb",
+  "atc",
+  "atd",
+  "ate",
+  "atg",
+  "ath",
+  "ati",
+  "atj",
+  "atk",
+  "atl",
+  "atm",
+  "atn",
+  "ato",
+  "atp",
+  "atq",
+  "atr",
+  "ats",
+  "att",
+  "atu",
+  "atv",
+  "atw",
+  "atx",
+  "aty",
+  "atz",
+  "aua",
+  "aub",
+  "auc",
+  "aud",
+  "aue",
+  "auf",
+  "aug",
+  "auh",
+  "aui",
+  "auj",
+  "auk",
+  "aul",
+  "aum",
+  "aun",
+  "auo",
+  "aup",
+  "auq",
+  "aur",
+  "aus",
+  "aut",
+  "auu",
+  "auw",
+  "aux",
+  "auy",
+  "auz",
+  "avb",
+  "avd",
+  "avi",
+  "avk",
+  "avl",
+  "avm",
+  "avn",
+  "avo",
+  "avs",
+  "avt",
+  "avu",
+  "avv",
+  "awa",
+  "awb",
+  "awc",
+  "awd",
+  "awe",
+  "awg",
+  "awh",
+  "awi",
+  "awk",
+  "awm",
+  "awn",
+  "awo",
+  "awr",
+  "aws",
+  "awt",
+  "awu",
+  "awv",
+  "aww",
+  "awx",
+  "awy",
+  "axb",
+  "axe",
+  "axg",
+  "axk",
+  "axl",
+  "axm",
+  "axx",
+  "aya",
+  "ayb",
+  "ayc",
+  "ayd",
+  "aye",
+  "ayg",
+  "ayh",
+  "ayi",
+  "ayk",
+  "ayl",
+  "ayn",
+  "ayo",
+  "ayp",
+  "ayq",
+  "ayr",
+  "ays",
+  "ayt",
+  "ayu",
+  "ayx",
+  "ayy",
+  "ayz",
+  "aza",
+  "azb",
+  "azc",
+  "azd",
+  "azg",
+  "azj",
+  "azm",
+  "azn",
+  "azo",
+  "azt",
+  "azz",
+  "baa",
+  "bab",
+  "bac",
+  "bad",
+  "bae",
+  "baf",
+  "bag",
+  "bah",
+  "bai",
+  "baj",
+  "bal",
+  "ban",
+  "bao",
+  "bap",
+  "bar",
+  "bas",
+  "bat",
+  "bau",
+  "bav",
+  "baw",
+  "bax",
+  "bay",
+  "baz",
+  "bba",
+  "bbb",
+  "bbc",
+  "bbd",
+  "bbe",
+  "bbf",
+  "bbg",
+  "bbh",
+  "bbi",
+  "bbj",
+  "bbk",
+  "bbl",
+  "bbm",
+  "bbn",
+  "bbo",
+  "bbp",
+  "bbq",
+  "bbr",
+  "bbs",
+  "bbt",
+  "bbu",
+  "bbv",
+  "bbw",
+  "bbx",
+  "bby",
+  "bbz",
+  "bca",
+  "bcb",
+  "bcc",
+  "bcd",
+  "bce",
+  "bcf",
+  "bcg",
+  "bch",
+  "bci",
+  "bcj",
+  "bck",
+  "bcl",
+  "bcm",
+  "bcn",
+  "bco",
+  "bcp",
+  "bcq",
+  "bcr",
+  "bcs",
+  "bct",
+  "bcu",
+  "bcv",
+  "bcw",
+  "bcy",
+  "bcz",
+  "bda",
+  "bdb",
+  "bdc",
+  "bdd",
+  "bde",
+  "bdf",
+  "bdg",
+  "bdh",
+  "bdi",
+  "bdj",
+  "bdk",
+  "bdl",
+  "bdm",
+  "bdn",
+  "bdo",
+  "bdp",
+  "bdq",
+  "bdr",
+  "bds",
+  "bdt",
+  "bdu",
+  "bdv",
+  "bdw",
+  "bdx",
+  "bdy",
+  "bdz",
+  "bea",
+  "beb",
+  "bec",
+  "bed",
+  "bee",
+  "bef",
+  "beg",
+  "beh",
+  "bei",
+  "bej",
+  "bek",
+  "bem",
+  "beo",
+  "bep",
+  "beq",
+  "ber",
+  "bes",
+  "bet",
+  "beu",
+  "bev",
+  "bew",
+  "bex",
+  "bey",
+  "bez",
+  "bfa",
+  "bfb",
+  "bfc",
+  "bfd",
+  "bfe",
+  "bff",
+  "bfg",
+  "bfh",
+  "bfi",
+  "bfj",
+  "bfk",
+  "bfl",
+  "bfm",
+  "bfn",
+  "bfo",
+  "bfp",
+  "bfq",
+  "bfr",
+  "bfs",
+  "bft",
+  "bfu",
+  "bfw",
+  "bfx",
+  "bfy",
+  "bfz",
+  "bga",
+  "bgb",
+  "bgc",
+  "bgd",
+  "bge",
+  "bgf",
+  "bgg",
+  "bgi",
+  "bgj",
+  "bgk",
+  "bgl",
+  "bgm",
+  "bgn",
+  "bgo",
+  "bgp",
+  "bgq",
+  "bgr",
+  "bgs",
+  "bgt",
+  "bgu",
+  "bgv",
+  "bgw",
+  "bgx",
+  "bgy",
+  "bgz",
+  "bha",
+  "bhb",
+  "bhc",
+  "bhd",
+  "bhe",
+  "bhf",
+  "bhg",
+  "bhh",
+  "bhi",
+  "bhj",
+  "bhk",
+  "bhl",
+  "bhm",
+  "bhn",
+  "bho",
+  "bhp",
+  "bhq",
+  "bhr",
+  "bhs",
+  "bht",
+  "bhu",
+  "bhv",
+  "bhw",
+  "bhx",
+  "bhy",
+  "bhz",
+  "bia",
+  "bib",
+  "bic",
+  "bid",
+  "bie",
+  "bif",
+  "big",
+  "bij",
+  "bik",
+  "bil",
+  "bim",
+  "bin",
+  "bio",
+  "bip",
+  "biq",
+  "bir",
+  "bit",
+  "biu",
+  "biv",
+  "biw",
+  "bix",
+  "biy",
+  "biz",
+  "bja",
+  "bjb",
+  "bjc",
+  "bjd",
+  "bje",
+  "bjf",
+  "bjg",
+  "bjh",
+  "bji",
+  "bjj",
+  "bjk",
+  "bjl",
+  "bjm",
+  "bjn",
+  "bjo",
+  "bjp",
+  "bjq",
+  "bjr",
+  "bjs",
+  "bjt",
+  "bju",
+  "bjv",
+  "bjw",
+  "bjx",
+  "bjy",
+  "bjz",
+  "bka",
+  "bkb",
+  "bkc",
+  "bkd",
+  "bkf",
+  "bkg",
+  "bkh",
+  "bki",
+  "bkj",
+  "bkk",
+  "bkl",
+  "bkm",
+  "bkn",
+  "bko",
+  "bkp",
+  "bkq",
+  "bkr",
+  "bks",
+  "bkt",
+  "bku",
+  "bkv",
+  "bkw",
+  "bkx",
+  "bky",
+  "bkz",
+  "bla",
+  "blb",
+  "blc",
+  "bld",
+  "ble",
+  "blf",
+  "blg",
+  "blh",
+  "bli",
+  "blj",
+  "blk",
+  "bll",
+  "blm",
+  "bln",
+  "blo",
+  "blp",
+  "blq",
+  "blr",
+  "bls",
+  "blt",
+  "blv",
+  "blw",
+  "blx",
+  "bly",
+  "blz",
+  "bma",
+  "bmb",
+  "bmc",
+  "bmd",
+  "bme",
+  "bmf",
+  "bmg",
+  "bmh",
+  "bmi",
+  "bmj",
+  "bmk",
+  "bml",
+  "bmm",
+  "bmn",
+  "bmo",
+  "bmp",
+  "bmq",
+  "bmr",
+  "bms",
+  "bmt",
+  "bmu",
+  "bmv",
+  "bmw",
+  "bmx",
+  "bmy",
+  "bmz",
+  "bna",
+  "bnb",
+  "bnc",
+  "bnd",
+  "bne",
+  "bnf",
+  "bng",
+  "bni",
+  "bnj",
+  "bnk",
+  "bnl",
+  "bnm",
+  "bnn",
+  "bno",
+  "bnp",
+  "bnq",
+  "bnr",
+  "bns",
+  "bnt",
+  "bnu",
+  "bnv",
+  "bnw",
+  "bnx",
+  "bny",
+  "bnz",
+  "boa",
+  "bob",
+  "boe",
+  "bof",
+  "bog",
+  "boh",
+  "boi",
+  "boj",
+  "bok",
+  "bol",
+  "bom",
+  "bon",
+  "boo",
+  "bop",
+  "boq",
+  "bor",
+  "bot",
+  "bou",
+  "bov",
+  "bow",
+  "box",
+  "boy",
+  "boz",
+  "bpa",
+  "bpb",
+  "bpd",
+  "bpg",
+  "bph",
+  "bpi",
+  "bpj",
+  "bpk",
+  "bpl",
+  "bpm",
+  "bpn",
+  "bpo",
+  "bpp",
+  "bpq",
+  "bpr",
+  "bps",
+  "bpt",
+  "bpu",
+  "bpv",
+  "bpw",
+  "bpx",
+  "bpy",
+  "bpz",
+  "bqa",
+  "bqb",
+  "bqc",
+  "bqd",
+  "bqf",
+  "bqg",
+  "bqh",
+  "bqi",
+  "bqj",
+  "bqk",
+  "bql",
+  "bqm",
+  "bqn",
+  "bqo",
+  "bqp",
+  "bqq",
+  "bqr",
+  "bqs",
+  "bqt",
+  "bqu",
+  "bqv",
+  "bqw",
+  "bqx",
+  "bqy",
+  "bqz",
+  "bra",
+  "brb",
+  "brc",
+  "brd",
+  "brf",
+  "brg",
+  "brh",
+  "bri",
+  "brj",
+  "brk",
+  "brl",
+  "brm",
+  "brn",
+  "bro",
+  "brp",
+  "brq",
+  "brr",
+  "brs",
+  "brt",
+  "bru",
+  "brv",
+  "brw",
+  "brx",
+  "bry",
+  "brz",
+  "bsa",
+  "bsb",
+  "bsc",
+  "bse",
+  "bsf",
+  "bsg",
+  "bsh",
+  "bsi",
+  "bsj",
+  "bsk",
+  "bsl",
+  "bsm",
+  "bsn",
+  "bso",
+  "bsp",
+  "bsq",
+  "bsr",
+  "bss",
+  "bst",
+  "bsu",
+  "bsv",
+  "bsw",
+  "bsx",
+  "bsy",
+  "bta",
+  "btb",
+  "btc",
+  "btd",
+  "bte",
+  "btf",
+  "btg",
+  "bth",
+  "bti",
+  "btj",
+  "btk",
+  "btl",
+  "btm",
+  "btn",
+  "bto",
+  "btp",
+  "btq",
+  "btr",
+  "bts",
+  "btt",
+  "btu",
+  "btv",
+  "btw",
+  "btx",
+  "bty",
+  "btz",
+  "bua",
+  "bub",
+  "buc",
+  "bud",
+  "bue",
+  "buf",
+  "bug",
+  "buh",
+  "bui",
+  "buj",
+  "buk",
+  "bum",
+  "bun",
+  "buo",
+  "bup",
+  "buq",
+  "bus",
+  "but",
+  "buu",
+  "buv",
+  "buw",
+  "bux",
+  "buy",
+  "buz",
+  "bva",
+  "bvb",
+  "bvc",
+  "bvd",
+  "bve",
+  "bvf",
+  "bvg",
+  "bvh",
+  "bvi",
+  "bvj",
+  "bvk",
+  "bvl",
+  "bvm",
+  "bvn",
+  "bvo",
+  "bvp",
+  "bvq",
+  "bvr",
+  "bvt",
+  "bvu",
+  "bvv",
+  "bvw",
+  "bvx",
+  "bvy",
+  "bvz",
+  "bwa",
+  "bwb",
+  "bwc",
+  "bwd",
+  "bwe",
+  "bwf",
+  "bwg",
+  "bwh",
+  "bwi",
+  "bwj",
+  "bwk",
+  "bwl",
+  "bwm",
+  "bwn",
+  "bwo",
+  "bwp",
+  "bwq",
+  "bwr",
+  "bws",
+  "bwt",
+  "bwu",
+  "bww",
+  "bwx",
+  "bwy",
+  "bwz",
+  "bxa",
+  "bxb",
+  "bxc",
+  "bxd",
+  "bxe",
+  "bxf",
+  "bxg",
+  "bxh",
+  "bxi",
+  "bxj",
+  "bxk",
+  "bxl",
+  "bxm",
+  "bxn",
+  "bxo",
+  "bxp",
+  "bxq",
+  "bxr",
+  "bxs",
+  "bxu",
+  "bxv",
+  "bxw",
+  "bxx",
+  "bxz",
+  "bya",
+  "byb",
+  "byc",
+  "byd",
+  "bye",
+  "byf",
+  "byg",
+  "byh",
+  "byi",
+  "byj",
+  "byk",
+  "byl",
+  "bym",
+  "byn",
+  "byo",
+  "byp",
+  "byq",
+  "byr",
+  "bys",
+  "byt",
+  "byv",
+  "byw",
+  "byx",
+  "byy",
+  "byz",
+  "bza",
+  "bzb",
+  "bzc",
+  "bzd",
+  "bze",
+  "bzf",
+  "bzg",
+  "bzh",
+  "bzi",
+  "bzj",
+  "bzk",
+  "bzl",
+  "bzm",
+  "bzn",
+  "bzo",
+  "bzp",
+  "bzq",
+  "bzr",
+  "bzs",
+  "bzt",
+  "bzu",
+  "bzv",
+  "bzw",
+  "bzx",
+  "bzy",
+  "bzz",
+  "caa",
+  "cab",
+  "cac",
+  "cad",
+  "cae",
+  "caf",
+  "cag",
+  "cah",
+  "cai",
+  "caj",
+  "cak",
+  "cal",
+  "cam",
+  "can",
+  "cao",
+  "cap",
+  "caq",
+  "car",
+  "cas",
+  "cau",
+  "cav",
+  "caw",
+  "cax",
+  "cay",
+  "caz",
+  "cba",
+  "cbb",
+  "cbc",
+  "cbd",
+  "cbe",
+  "cbg",
+  "cbh",
+  "cbi",
+  "cbj",
+  "cbk",
+  "cbl",
+  "cbn",
+  "cbo",
+  "cbq",
+  "cbr",
+  "cbs",
+  "cbt",
+  "cbu",
+  "cbv",
+  "cbw",
+  "cby",
+  "cca",
+  "ccc",
+  "ccd",
+  "cce",
+  "ccg",
+  "cch",
+  "ccj",
+  "ccl",
+  "ccm",
+  "ccn",
+  "cco",
+  "ccp",
+  "ccq",
+  "ccr",
+  "ccs",
+  "cda",
+  "cdc",
+  "cdd",
+  "cde",
+  "cdf",
+  "cdg",
+  "cdh",
+  "cdi",
+  "cdj",
+  "cdm",
+  "cdn",
+  "cdo",
+  "cdr",
+  "cds",
+  "cdy",
+  "cdz",
+  "cea",
+  "ceb",
+  "ceg",
+  "cek",
+  "cel",
+  "cen",
+  "cet",
+  "cfa",
+  "cfd",
+  "cfg",
+  "cfm",
+  "cga",
+  "cgc",
+  "cgg",
+  "cgk",
+  "chb",
+  "chc",
+  "chd",
+  "chf",
+  "chg",
+  "chh",
+  "chj",
+  "chk",
+  "chl",
+  "chm",
+  "chn",
+  "cho",
+  "chp",
+  "chq",
+  "chr",
+  "cht",
+  "chw",
+  "chx",
+  "chy",
+  "chz",
+  "cia",
+  "cib",
+  "cic",
+  "cid",
+  "cie",
+  "cih",
+  "cik",
+  "cim",
+  "cin",
+  "cip",
+  "cir",
+  "ciw",
+  "ciy",
+  "cja",
+  "cje",
+  "cjh",
+  "cji",
+  "cjk",
+  "cjm",
+  "cjn",
+  "cjo",
+  "cjp",
+  "cjr",
+  "cjs",
+  "cjv",
+  "cjy",
+  "cka",
+  "ckb",
+  "ckh",
+  "ckl",
+  "ckn",
+  "cko",
+  "ckq",
+  "ckr",
+  "cks",
+  "ckt",
+  "cku",
+  "ckv",
+  "ckx",
+  "cky",
+  "ckz",
+  "cla",
+  "clc",
+  "cld",
+  "cle",
+  "clh",
+  "cli",
+  "clj",
+  "clk",
+  "cll",
+  "clm",
+  "clo",
+  "clt",
+  "clu",
+  "clw",
+  "cly",
+  "cma",
+  "cmc",
+  "cme",
+  "cmg",
+  "cmi",
+  "cmk",
+  "cml",
+  "cmm",
+  "cmn",
+  "cmo",
+  "cmr",
+  "cms",
+  "cmt",
+  "cna",
+  "cnb",
+  "cnc",
+  "cng",
+  "cnh",
+  "cni",
+  "cnk",
+  "cnl",
+  "cno",
+  "cns",
+  "cnt",
+  "cnu",
+  "cnw",
+  "cnx",
+  "coa",
+  "cob",
+  "coc",
+  "cod",
+  "coe",
+  "cof",
+  "cog",
+  "coh",
+  "coj",
+  "cok",
+  "col",
+  "com",
+  "con",
+  "coo",
+  "cop",
+  "coq",
+  "cot",
+  "cou",
+  "cov",
+  "cow",
+  "cox",
+  "coy",
+  "coz",
+  "cpa",
+  "cpb",
+  "cpc",
+  "cpe",
+  "cpf",
+  "cpg",
+  "cpi",
+  "cpn",
+  "cpo",
+  "cpp",
+  "cps",
+  "cpu",
+  "cpx",
+  "cpy",
+  "cqd",
+  "cqu",
+  "cra",
+  "crb",
+  "crc",
+  "crd",
+  "crf",
+  "crg",
+  "crh",
+  "cri",
+  "crj",
+  "crk",
+  "crl",
+  "crm",
+  "crn",
+  "cro",
+  "crp",
+  "crq",
+  "crr",
+  "crs",
+  "crt",
+  "crv",
+  "crw",
+  "crx",
+  "cry",
+  "crz",
+  "csa",
+  "csb",
+  "csc",
+  "csd",
+  "cse",
+  "csf",
+  "csg",
+  "csh",
+  "csi",
+  "csj",
+  "csk",
+  "csl",
+  "csm",
+  "csn",
+  "cso",
+  "csq",
+  "csr",
+  "css",
+  "cst",
+  "csu",
+  "csv",
+  "csw",
+  "csy",
+  "csz",
+  "cta",
+  "ctc",
+  "ctd",
+  "cte",
+  "ctg",
+  "cth",
+  "ctl",
+  "ctm",
+  "ctn",
+  "cto",
+  "ctp",
+  "cts",
+  "ctt",
+  "ctu",
+  "ctz",
+  "cua",
+  "cub",
+  "cuc",
+  "cug",
+  "cuh",
+  "cui",
+  "cuj",
+  "cuk",
+  "cul",
+  "cum",
+  "cuo",
+  "cup",
+  "cuq",
+  "cur",
+  "cus",
+  "cut",
+  "cuu",
+  "cuv",
+  "cuw",
+  "cux",
+  "cvg",
+  "cvn",
+  "cwa",
+  "cwb",
+  "cwd",
+  "cwe",
+  "cwg",
+  "cwt",
+  "cya",
+  "cyb",
+  "cyo",
+  "czh",
+  "czk",
+  "czn",
+  "czo",
+  "czt",
+  "daa",
+  "dac",
+  "dad",
+  "dae",
+  "daf",
+  "dag",
+  "dah",
+  "dai",
+  "daj",
+  "dak",
+  "dal",
+  "dam",
+  "dao",
+  "dap",
+  "daq",
+  "dar",
+  "das",
+  "dau",
+  "dav",
+  "daw",
+  "dax",
+  "day",
+  "daz",
+  "dba",
+  "dbb",
+  "dbd",
+  "dbe",
+  "dbf",
+  "dbg",
+  "dbi",
+  "dbj",
+  "dbl",
+  "dbm",
+  "dbn",
+  "dbo",
+  "dbp",
+  "dbq",
+  "dbr",
+  "dbt",
+  "dbu",
+  "dbv",
+  "dbw",
+  "dby",
+  "dcc",
+  "dcr",
+  "dda",
+  "ddd",
+  "dde",
+  "ddg",
+  "ddi",
+  "ddj",
+  "ddn",
+  "ddo",
+  "ddr",
+  "dds",
+  "ddw",
+  "dec",
+  "ded",
+  "dee",
+  "def",
+  "deg",
+  "deh",
+  "dei",
+  "dek",
+  "del",
+  "dem",
+  "den",
+  "dep",
+  "deq",
+  "der",
+  "des",
+  "dev",
+  "dez",
+  "dga",
+  "dgb",
+  "dgc",
+  "dgd",
+  "dge",
+  "dgg",
+  "dgh",
+  "dgi",
+  "dgk",
+  "dgl",
+  "dgn",
+  "dgo",
+  "dgr",
+  "dgs",
+  "dgt",
+  "dgu",
+  "dgw",
+  "dgx",
+  "dgz",
+  "dha",
+  "dhd",
+  "dhg",
+  "dhi",
+  "dhl",
+  "dhm",
+  "dhn",
+  "dho",
+  "dhr",
+  "dhs",
+  "dhu",
+  "dhv",
+  "dhw",
+  "dhx",
+  "dia",
+  "dib",
+  "dic",
+  "did",
+  "dif",
+  "dig",
+  "dih",
+  "dii",
+  "dij",
+  "dik",
+  "dil",
+  "dim",
+  "din",
+  "dio",
+  "dip",
+  "diq",
+  "dir",
+  "dis",
+  "dit",
+  "diu",
+  "diw",
+  "dix",
+  "diy",
+  "diz",
+  "dja",
+  "djb",
+  "djc",
+  "djd",
+  "dje",
+  "djf",
+  "dji",
+  "djj",
+  "djk",
+  "djl",
+  "djm",
+  "djn",
+  "djo",
+  "djr",
+  "dju",
+  "djw",
+  "dka",
+  "dkk",
+  "dkl",
+  "dkr",
+  "dks",
+  "dkx",
+  "dlg",
+  "dlk",
+  "dlm",
+  "dln",
+  "dma",
+  "dmb",
+  "dmc",
+  "dmd",
+  "dme",
+  "dmg",
+  "dmk",
+  "dml",
+  "dmm",
+  "dmn",
+  "dmo",
+  "dmr",
+  "dms",
+  "dmu",
+  "dmv",
+  "dmw",
+  "dmx",
+  "dmy",
+  "dna",
+  "dnd",
+  "dne",
+  "dng",
+  "dni",
+  "dnj",
+  "dnk",
+  "dnn",
+  "dnr",
+  "dnt",
+  "dnu",
+  "dnv",
+  "dnw",
+  "dny",
+  "doa",
+  "dob",
+  "doc",
+  "doe",
+  "dof",
+  "doh",
+  "doi",
+  "dok",
+  "dol",
+  "don",
+  "doo",
+  "dop",
+  "doq",
+  "dor",
+  "dos",
+  "dot",
+  "dov",
+  "dow",
+  "dox",
+  "doy",
+  "doz",
+  "dpp",
+  "dra",
+  "drb",
+  "drc",
+  "drd",
+  "dre",
+  "drg",
+  "drh",
+  "dri",
+  "drl",
+  "drn",
+  "dro",
+  "drq",
+  "drr",
+  "drs",
+  "drt",
+  "dru",
+  "drw",
+  "dry",
+  "dsb",
+  "dse",
+  "dsh",
+  "dsi",
+  "dsl",
+  "dsn",
+  "dso",
+  "dsq",
+  "dta",
+  "dtb",
+  "dtd",
+  "dth",
+  "dti",
+  "dtk",
+  "dtm",
+  "dtn",
+  "dto",
+  "dtp",
+  "dtr",
+  "dts",
+  "dtt",
+  "dtu",
+  "dty",
+  "dua",
+  "dub",
+  "duc",
+  "dud",
+  "due",
+  "duf",
+  "dug",
+  "duh",
+  "dui",
+  "duj",
+  "duk",
+  "dul",
+  "dum",
+  "dun",
+  "duo",
+  "dup",
+  "duq",
+  "dur",
+  "dus",
+  "duu",
+  "duv",
+  "duw",
+  "dux",
+  "duy",
+  "duz",
+  "dva",
+  "dwa",
+  "dwl",
+  "dwr",
+  "dws",
+  "dwu",
+  "dww",
+  "dwy",
+  "dya",
+  "dyb",
+  "dyd",
+  "dyg",
+  "dyi",
+  "dym",
+  "dyn",
+  "dyo",
+  "dyu",
+  "dyy",
+  "dza",
+  "dzd",
+  "dze",
+  "dzg",
+  "dzl",
+  "dzn",
+  "eaa",
+  "ebg",
+  "ebk",
+  "ebo",
+  "ebr",
+  "ebu",
+  "ecr",
+  "ecs",
+  "ecy",
+  "eee",
+  "efa",
+  "efe",
+  "efi",
+  "ega",
+  "egl",
+  "ego",
+  "egx",
+  "egy",
+  "ehu",
+  "eip",
+  "eit",
+  "eiv",
+  "eja",
+  "eka",
+  "ekc",
+  "eke",
+  "ekg",
+  "eki",
+  "ekk",
+  "ekl",
+  "ekm",
+  "eko",
+  "ekp",
+  "ekr",
+  "eky",
+  "ele",
+  "elh",
+  "eli",
+  "elk",
+  "elm",
+  "elo",
+  "elp",
+  "elu",
+  "elx",
+  "ema",
+  "emb",
+  "eme",
+  "emg",
+  "emi",
+  "emk",
+  "emm",
+  "emn",
+  "emo",
+  "emp",
+  "ems",
+  "emu",
+  "emw",
+  "emx",
+  "emy",
+  "ena",
+  "enb",
+  "enc",
+  "end",
+  "enf",
+  "enh",
+  "enl",
+  "enm",
+  "enn",
+  "eno",
+  "enq",
+  "enr",
+  "enu",
+  "env",
+  "enw",
+  "enx",
+  "eot",
+  "epi",
+  "era",
+  "erg",
+  "erh",
+  "eri",
+  "erk",
+  "ero",
+  "err",
+  "ers",
+  "ert",
+  "erw",
+  "ese",
+  "esg",
+  "esh",
+  "esi",
+  "esk",
+  "esl",
+  "esm",
+  "esn",
+  "eso",
+  "esq",
+  "ess",
+  "esu",
+  "esx",
+  "esy",
+  "etb",
+  "etc",
+  "eth",
+  "etn",
+  "eto",
+  "etr",
+  "ets",
+  "ett",
+  "etu",
+  "etx",
+  "etz",
+  "euq",
+  "eve",
+  "evh",
+  "evn",
+  "ewo",
+  "ext",
+  "eya",
+  "eyo",
+  "eza",
+  "eze",
+  "faa",
+  "fab",
+  "fad",
+  "faf",
+  "fag",
+  "fah",
+  "fai",
+  "faj",
+  "fak",
+  "fal",
+  "fam",
+  "fan",
+  "fap",
+  "far",
+  "fat",
+  "fau",
+  "fax",
+  "fay",
+  "faz",
+  "fbl",
+  "fcs",
+  "fer",
+  "ffi",
+  "ffm",
+  "fgr",
+  "fia",
+  "fie",
+  "fil",
+  "fip",
+  "fir",
+  "fit",
+  "fiu",
+  "fiw",
+  "fkk",
+  "fkv",
+  "fla",
+  "flh",
+  "fli",
+  "fll",
+  "fln",
+  "flr",
+  "fly",
+  "fmp",
+  "fmu",
+  "fnb",
+  "fng",
+  "fni",
+  "fod",
+  "foi",
+  "fom",
+  "fon",
+  "for",
+  "fos",
+  "fox",
+  "fpe",
+  "fqs",
+  "frc",
+  "frd",
+  "frk",
+  "frm",
+  "fro",
+  "frp",
+  "frq",
+  "frr",
+  "frs",
+  "frt",
+  "fse",
+  "fsl",
+  "fss",
+  "fub",
+  "fuc",
+  "fud",
+  "fue",
+  "fuf",
+  "fuh",
+  "fui",
+  "fuj",
+  "fum",
+  "fun",
+  "fuq",
+  "fur",
+  "fut",
+  "fuu",
+  "fuv",
+  "fuy",
+  "fvr",
+  "fwa",
+  "fwe",
+  "gaa",
+  "gab",
+  "gac",
+  "gad",
+  "gae",
+  "gaf",
+  "gag",
+  "gah",
+  "gai",
+  "gaj",
+  "gak",
+  "gal",
+  "gam",
+  "gan",
+  "gao",
+  "gap",
+  "gaq",
+  "gar",
+  "gas",
+  "gat",
+  "gau",
+  "gav",
+  "gaw",
+  "gax",
+  "gay",
+  "gaz",
+  "gba",
+  "gbb",
+  "gbc",
+  "gbd",
+  "gbe",
+  "gbf",
+  "gbg",
+  "gbh",
+  "gbi",
+  "gbj",
+  "gbk",
+  "gbl",
+  "gbm",
+  "gbn",
+  "gbo",
+  "gbp",
+  "gbq",
+  "gbr",
+  "gbs",
+  "gbu",
+  "gbv",
+  "gbw",
+  "gbx",
+  "gby",
+  "gbz",
+  "gcc",
+  "gcd",
+  "gce",
+  "gcf",
+  "gcl",
+  "gcn",
+  "gcr",
+  "gct",
+  "gda",
+  "gdb",
+  "gdc",
+  "gdd",
+  "gde",
+  "gdf",
+  "gdg",
+  "gdh",
+  "gdi",
+  "gdj",
+  "gdk",
+  "gdl",
+  "gdm",
+  "gdn",
+  "gdo",
+  "gdq",
+  "gdr",
+  "gds",
+  "gdt",
+  "gdu",
+  "gdx",
+  "gea",
+  "geb",
+  "gec",
+  "ged",
+  "geg",
+  "geh",
+  "gei",
+  "gej",
+  "gek",
+  "gel",
+  "gem",
+  "geq",
+  "ges",
+  "gev",
+  "gew",
+  "gex",
+  "gey",
+  "gez",
+  "gfk",
+  "gft",
+  "gfx",
+  "gga",
+  "ggb",
+  "ggd",
+  "gge",
+  "ggg",
+  "ggk",
+  "ggl",
+  "ggn",
+  "ggo",
+  "ggr",
+  "ggt",
+  "ggu",
+  "ggw",
+  "gha",
+  "ghc",
+  "ghe",
+  "ghh",
+  "ghk",
+  "ghl",
+  "ghn",
+  "gho",
+  "ghr",
+  "ghs",
+  "ght",
+  "gia",
+  "gib",
+  "gic",
+  "gid",
+  "gig",
+  "gih",
+  "gil",
+  "gim",
+  "gin",
+  "gio",
+  "gip",
+  "giq",
+  "gir",
+  "gis",
+  "git",
+  "giu",
+  "giw",
+  "gix",
+  "giy",
+  "giz",
+  "gji",
+  "gjk",
+  "gjm",
+  "gjn",
+  "gjr",
+  "gju",
+  "gka",
+  "gke",
+  "gkn",
+  "gko",
+  "gkp",
+  "gku",
+  "glc",
+  "gld",
+  "glh",
+  "gli",
+  "glj",
+  "glk",
+  "gll",
+  "glo",
+  "glr",
+  "glu",
+  "glw",
+  "gly",
+  "gma",
+  "gmb",
+  "gmd",
+  "gme",
+  "gmg",
+  "gmh",
+  "gml",
+  "gmm",
+  "gmn",
+  "gmq",
+  "gmu",
+  "gmv",
+  "gmw",
+  "gmx",
+  "gmy",
+  "gmz",
+  "gna",
+  "gnb",
+  "gnc",
+  "gnd",
+  "gne",
+  "gng",
+  "gnh",
+  "gni",
+  "gnk",
+  "gnl",
+  "gnm",
+  "gnn",
+  "gno",
+  "gnq",
+  "gnr",
+  "gnt",
+  "gnu",
+  "gnw",
+  "gnz",
+  "goa",
+  "gob",
+  "goc",
+  "god",
+  "goe",
+  "gof",
+  "gog",
+  "goh",
+  "goi",
+  "goj",
+  "gok",
+  "gol",
+  "gom",
+  "gon",
+  "goo",
+  "gop",
+  "goq",
+  "gor",
+  "gos",
+  "got",
+  "gou",
+  "gow",
+  "gox",
+  "goy",
+  "goz",
+  "gpa",
+  "gpe",
+  "gpn",
+  "gqa",
+  "gqi",
+  "gqn",
+  "gqr",
+  "gqu",
+  "gra",
+  "grb",
+  "grc",
+  "grd",
+  "grg",
+  "grh",
+  "gri",
+  "grj",
+  "grk",
+  "grm",
+  "gro",
+  "grq",
+  "grr",
+  "grs",
+  "grt",
+  "gru",
+  "grv",
+  "grw",
+  "grx",
+  "gry",
+  "grz",
+  "gse",
+  "gsg",
+  "gsl",
+  "gsm",
+  "gsn",
+  "gso",
+  "gsp",
+  "gss",
+  "gsw",
+  "gta",
+  "gti",
+  "gtu",
+  "gua",
+  "gub",
+  "guc",
+  "gud",
+  "gue",
+  "guf",
+  "gug",
+  "guh",
+  "gui",
+  "guk",
+  "gul",
+  "gum",
+  "gun",
+  "guo",
+  "gup",
+  "guq",
+  "gur",
+  "gus",
+  "gut",
+  "guu",
+  "guv",
+  "guw",
+  "gux",
+  "guz",
+  "gva",
+  "gvc",
+  "gve",
+  "gvf",
+  "gvj",
+  "gvl",
+  "gvm",
+  "gvn",
+  "gvo",
+  "gvp",
+  "gvr",
+  "gvs",
+  "gvy",
+  "gwa",
+  "gwb",
+  "gwc",
+  "gwd",
+  "gwe",
+  "gwf",
+  "gwg",
+  "gwi",
+  "gwj",
+  "gwm",
+  "gwn",
+  "gwr",
+  "gwt",
+  "gwu",
+  "gww",
+  "gwx",
+  "gxx",
+  "gya",
+  "gyb",
+  "gyd",
+  "gye",
+  "gyf",
+  "gyg",
+  "gyi",
+  "gyl",
+  "gym",
+  "gyn",
+  "gyr",
+  "gyy",
+  "gza",
+  "gzi",
+  "gzn",
+  "haa",
+  "hab",
+  "hac",
+  "had",
+  "hae",
+  "haf",
+  "hag",
+  "hah",
+  "hai",
+  "haj",
+  "hak",
+  "hal",
+  "ham",
+  "han",
+  "hao",
+  "hap",
+  "haq",
+  "har",
+  "has",
+  "hav",
+  "haw",
+  "hax",
+  "hay",
+  "haz",
+  "hba",
+  "hbb",
+  "hbn",
+  "hbo",
+  "hbu",
+  "hca",
+  "hch",
+  "hdn",
+  "hds",
+  "hdy",
+  "hea",
+  "hed",
+  "heg",
+  "heh",
+  "hei",
+  "hem",
+  "hgm",
+  "hgw",
+  "hhi",
+  "hhr",
+  "hhy",
+  "hia",
+  "hib",
+  "hid",
+  "hif",
+  "hig",
+  "hih",
+  "hii",
+  "hij",
+  "hik",
+  "hil",
+  "him",
+  "hio",
+  "hir",
+  "hit",
+  "hiw",
+  "hix",
+  "hji",
+  "hka",
+  "hke",
+  "hkk",
+  "hks",
+  "hla",
+  "hlb",
+  "hld",
+  "hle",
+  "hlt",
+  "hlu",
+  "hma",
+  "hmb",
+  "hmc",
+  "hmd",
+  "hme",
+  "hmf",
+  "hmg",
+  "hmh",
+  "hmi",
+  "hmj",
+  "hmk",
+  "hml",
+  "hmm",
+  "hmn",
+  "hmp",
+  "hmq",
+  "hmr",
+  "hms",
+  "hmt",
+  "hmu",
+  "hmv",
+  "hmw",
+  "hmx",
+  "hmy",
+  "hmz",
+  "hna",
+  "hnd",
+  "hne",
+  "hnh",
+  "hni",
+  "hnj",
+  "hnn",
+  "hno",
+  "hns",
+  "hnu",
+  "hoa",
+  "hob",
+  "hoc",
+  "hod",
+  "hoe",
+  "hoh",
+  "hoi",
+  "hoj",
+  "hok",
+  "hol",
+  "hom",
+  "hoo",
+  "hop",
+  "hor",
+  "hos",
+  "hot",
+  "hov",
+  "how",
+  "hoy",
+  "hoz",
+  "hpo",
+  "hps",
+  "hra",
+  "hrc",
+  "hre",
+  "hrk",
+  "hrm",
+  "hro",
+  "hrp",
+  "hrr",
+  "hrt",
+  "hru",
+  "hrw",
+  "hrx",
+  "hrz",
+  "hsb",
+  "hsh",
+  "hsl",
+  "hsn",
+  "hss",
+  "hti",
+  "hto",
+  "hts",
+  "htu",
+  "htx",
+  "hub",
+  "huc",
+  "hud",
+  "hue",
+  "huf",
+  "hug",
+  "huh",
+  "hui",
+  "huj",
+  "huk",
+  "hul",
+  "hum",
+  "huo",
+  "hup",
+  "huq",
+  "hur",
+  "hus",
+  "hut",
+  "huu",
+  "huv",
+  "huw",
+  "hux",
+  "huy",
+  "huz",
+  "hvc",
+  "hve",
+  "hvk",
+  "hvn",
+  "hvv",
+  "hwa",
+  "hwc",
+  "hwo",
+  "hya",
+  "hyx",
+  "iai",
+  "ian",
+  "iap",
+  "iar",
+  "iba",
+  "ibb",
+  "ibd",
+  "ibe",
+  "ibg",
+  "ibi",
+  "ibl",
+  "ibm",
+  "ibn",
+  "ibr",
+  "ibu",
+  "iby",
+  "ica",
+  "ich",
+  "icl",
+  "icr",
+  "ida",
+  "idb",
+  "idc",
+  "idd",
+  "ide",
+  "idi",
+  "idr",
+  "ids",
+  "idt",
+  "idu",
+  "ifa",
+  "ifb",
+  "ife",
+  "iff",
+  "ifk",
+  "ifm",
+  "ifu",
+  "ify",
+  "igb",
+  "ige",
+  "igg",
+  "igl",
+  "igm",
+  "ign",
+  "igo",
+  "igs",
+  "igw",
+  "ihb",
+  "ihi",
+  "ihp",
+  "ihw",
+  "iin",
+  "iir",
+  "ijc",
+  "ije",
+  "ijj",
+  "ijn",
+  "ijo",
+  "ijs",
+  "ike",
+  "iki",
+  "ikk",
+  "ikl",
+  "iko",
+  "ikp",
+  "ikr",
+  "iks",
+  "ikt",
+  "ikv",
+  "ikw",
+  "ikx",
+  "ikz",
+  "ila",
+  "ilb",
+  "ilg",
+  "ili",
+  "ilk",
+  "ill",
+  "ilm",
+  "ilo",
+  "ilp",
+  "ils",
+  "ilu",
+  "ilv",
+  "ilw",
+  "ima",
+  "ime",
+  "imi",
+  "iml",
+  "imn",
+  "imo",
+  "imr",
+  "ims",
+  "imy",
+  "inb",
+  "inc",
+  "ine",
+  "ing",
+  "inh",
+  "inj",
+  "inl",
+  "inm",
+  "inn",
+  "ino",
+  "inp",
+  "ins",
+  "int",
+  "inz",
+  "ior",
+  "iou",
+  "iow",
+  "ipi",
+  "ipo",
+  "iqu",
+  "iqw",
+  "ira",
+  "ire",
+  "irh",
+  "iri",
+  "irk",
+  "irn",
+  "iro",
+  "irr",
+  "iru",
+  "irx",
+  "iry",
+  "isa",
+  "isc",
+  "isd",
+  "ise",
+  "isg",
+  "ish",
+  "isi",
+  "isk",
+  "ism",
+  "isn",
+  "iso",
+  "isr",
+  "ist",
+  "isu",
+  "itb",
+  "itc",
+  "itd",
+  "ite",
+  "iti",
+  "itk",
+  "itl",
+  "itm",
+  "ito",
+  "itr",
+  "its",
+  "itt",
+  "itv",
+  "itw",
+  "itx",
+  "ity",
+  "itz",
+  "ium",
+  "ivb",
+  "ivv",
+  "iwk",
+  "iwm",
+  "iwo",
+  "iws",
+  "ixc",
+  "ixl",
+  "iya",
+  "iyo",
+  "iyx",
+  "izh",
+  "izi",
+  "izr",
+  "izz",
+  "jaa",
+  "jab",
+  "jac",
+  "jad",
+  "jae",
+  "jaf",
+  "jah",
+  "jaj",
+  "jak",
+  "jal",
+  "jam",
+  "jan",
+  "jao",
+  "jaq",
+  "jar",
+  "jas",
+  "jat",
+  "jau",
+  "jax",
+  "jay",
+  "jaz",
+  "jbe",
+  "jbi",
+  "jbj",
+  "jbk",
+  "jbn",
+  "jbo",
+  "jbr",
+  "jbt",
+  "jbu",
+  "jbw",
+  "jcs",
+  "jct",
+  "jda",
+  "jdg",
+  "jdt",
+  "jeb",
+  "jee",
+  "jeg",
+  "jeh",
+  "jei",
+  "jek",
+  "jel",
+  "jen",
+  "jer",
+  "jet",
+  "jeu",
+  "jgb",
+  "jge",
+  "jgk",
+  "jgo",
+  "jhi",
+  "jhs",
+  "jia",
+  "jib",
+  "jic",
+  "jid",
+  "jie",
+  "jig",
+  "jih",
+  "jii",
+  "jil",
+  "jim",
+  "jio",
+  "jiq",
+  "jit",
+  "jiu",
+  "jiv",
+  "jiy",
+  "jje",
+  "jjr",
+  "jka",
+  "jkm",
+  "jko",
+  "jkp",
+  "jkr",
+  "jku",
+  "jle",
+  "jls",
+  "jma",
+  "jmb",
+  "jmc",
+  "jmd",
+  "jmi",
+  "jml",
+  "jmn",
+  "jmr",
+  "jms",
+  "jmw",
+  "jmx",
+  "jna",
+  "jnd",
+  "jng",
+  "jni",
+  "jnj",
+  "jnl",
+  "jns",
+  "job",
+  "jod",
+  "jog",
+  "jor",
+  "jos",
+  "jow",
+  "jpa",
+  "jpr",
+  "jpx",
+  "jqr",
+  "jra",
+  "jrb",
+  "jrr",
+  "jrt",
+  "jru",
+  "jsl",
+  "jua",
+  "jub",
+  "juc",
+  "jud",
+  "juh",
+  "jui",
+  "juk",
+  "jul",
+  "jum",
+  "jun",
+  "juo",
+  "jup",
+  "jur",
+  "jus",
+  "jut",
+  "juu",
+  "juw",
+  "juy",
+  "jvd",
+  "jvn",
+  "jwi",
+  "jya",
+  "jye",
+  "jyy",
+  "kaa",
+  "kab",
+  "kac",
+  "kad",
+  "kae",
+  "kaf",
+  "kag",
+  "kah",
+  "kai",
+  "kaj",
+  "kak",
+  "kam",
+  "kao",
+  "kap",
+  "kaq",
+  "kar",
+  "kav",
+  "kaw",
+  "kax",
+  "kay",
+  "kba",
+  "kbb",
+  "kbc",
+  "kbd",
+  "kbe",
+  "kbf",
+  "kbg",
+  "kbh",
+  "kbi",
+  "kbj",
+  "kbk",
+  "kbl",
+  "kbm",
+  "kbn",
+  "kbo",
+  "kbp",
+  "kbq",
+  "kbr",
+  "kbs",
+  "kbt",
+  "kbu",
+  "kbv",
+  "kbw",
+  "kbx",
+  "kby",
+  "kbz",
+  "kca",
+  "kcb",
+  "kcc",
+  "kcd",
+  "kce",
+  "kcf",
+  "kcg",
+  "kch",
+  "kci",
+  "kcj",
+  "kck",
+  "kcl",
+  "kcm",
+  "kcn",
+  "kco",
+  "kcp",
+  "kcq",
+  "kcr",
+  "kcs",
+  "kct",
+  "kcu",
+  "kcv",
+  "kcw",
+  "kcx",
+  "kcy",
+  "kcz",
+  "kda",
+  "kdc",
+  "kdd",
+  "kde",
+  "kdf",
+  "kdg",
+  "kdh",
+  "kdi",
+  "kdj",
+  "kdk",
+  "kdl",
+  "kdm",
+  "kdn",
+  "kdo",
+  "kdp",
+  "kdq",
+  "kdr",
+  "kdt",
+  "kdu",
+  "kdv",
+  "kdw",
+  "kdx",
+  "kdy",
+  "kdz",
+  "kea",
+  "keb",
+  "kec",
+  "ked",
+  "kee",
+  "kef",
+  "keg",
+  "keh",
+  "kei",
+  "kej",
+  "kek",
+  "kel",
+  "kem",
+  "ken",
+  "keo",
+  "kep",
+  "keq",
+  "ker",
+  "kes",
+  "ket",
+  "keu",
+  "kev",
+  "kew",
+  "kex",
+  "key",
+  "kez",
+  "kfa",
+  "kfb",
+  "kfc",
+  "kfd",
+  "kfe",
+  "kff",
+  "kfg",
+  "kfh",
+  "kfi",
+  "kfj",
+  "kfk",
+  "kfl",
+  "kfm",
+  "kfn",
+  "kfo",
+  "kfp",
+  "kfq",
+  "kfr",
+  "kfs",
+  "kft",
+  "kfu",
+  "kfv",
+  "kfw",
+  "kfx",
+  "kfy",
+  "kfz",
+  "kga",
+  "kgb",
+  "kgc",
+  "kgd",
+  "kge",
+  "kgf",
+  "kgg",
+  "kgh",
+  "kgi",
+  "kgj",
+  "kgk",
+  "kgl",
+  "kgm",
+  "kgn",
+  "kgo",
+  "kgp",
+  "kgq",
+  "kgr",
+  "kgs",
+  "kgt",
+  "kgu",
+  "kgv",
+  "kgw",
+  "kgx",
+  "kgy",
+  "kha",
+  "khb",
+  "khc",
+  "khd",
+  "khe",
+  "khf",
+  "khg",
+  "khh",
+  "khi",
+  "khj",
+  "khk",
+  "khl",
+  "khn",
+  "kho",
+  "khp",
+  "khq",
+  "khr",
+  "khs",
+  "kht",
+  "khu",
+  "khv",
+  "khw",
+  "khx",
+  "khy",
+  "khz",
+  "kia",
+  "kib",
+  "kic",
+  "kid",
+  "kie",
+  "kif",
+  "kig",
+  "kih",
+  "kii",
+  "kij",
+  "kil",
+  "kim",
+  "kio",
+  "kip",
+  "kiq",
+  "kis",
+  "kit",
+  "kiu",
+  "kiv",
+  "kiw",
+  "kix",
+  "kiy",
+  "kiz",
+  "kja",
+  "kjb",
+  "kjc",
+  "kjd",
+  "kje",
+  "kjf",
+  "kjg",
+  "kjh",
+  "kji",
+  "kjj",
+  "kjk",
+  "kjl",
+  "kjm",
+  "kjn",
+  "kjo",
+  "kjp",
+  "kjq",
+  "kjr",
+  "kjs",
+  "kjt",
+  "kju",
+  "kjv",
+  "kjx",
+  "kjy",
+  "kjz",
+  "kka",
+  "kkb",
+  "kkc",
+  "kkd",
+  "kke",
+  "kkf",
+  "kkg",
+  "kkh",
+  "kki",
+  "kkj",
+  "kkk",
+  "kkl",
+  "kkm",
+  "kkn",
+  "kko",
+  "kkp",
+  "kkq",
+  "kkr",
+  "kks",
+  "kkt",
+  "kku",
+  "kkv",
+  "kkw",
+  "kkx",
+  "kky",
+  "kkz",
+  "kla",
+  "klb",
+  "klc",
+  "kld",
+  "kle",
+  "klf",
+  "klg",
+  "klh",
+  "kli",
+  "klj",
+  "klk",
+  "kll",
+  "klm",
+  "kln",
+  "klo",
+  "klp",
+  "klq",
+  "klr",
+  "kls",
+  "klt",
+  "klu",
+  "klv",
+  "klw",
+  "klx",
+  "kly",
+  "klz",
+  "kma",
+  "kmb",
+  "kmc",
+  "kmd",
+  "kme",
+  "kmf",
+  "kmg",
+  "kmh",
+  "kmi",
+  "kmj",
+  "kmk",
+  "kml",
+  "kmm",
+  "kmn",
+  "kmo",
+  "kmp",
+  "kmq",
+  "kmr",
+  "kms",
+  "kmt",
+  "kmu",
+  "kmv",
+  "kmw",
+  "kmx",
+  "kmy",
+  "kmz",
+  "kna",
+  "knb",
+  "knc",
+  "knd",
+  "kne",
+  "knf",
+  "kng",
+  "kni",
+  "knj",
+  "knk",
+  "knl",
+  "knm",
+  "knn",
+  "kno",
+  "knp",
+  "knq",
+  "knr",
+  "kns",
+  "knt",
+  "knu",
+  "knv",
+  "knw",
+  "knx",
+  "kny",
+  "knz",
+  "koa",
+  "koc",
+  "kod",
+  "koe",
+  "kof",
+  "kog",
+  "koh",
+  "koi",
+  "koj",
+  "kok",
+  "kol",
+  "koo",
+  "kop",
+  "koq",
+  "kos",
+  "kot",
+  "kou",
+  "kov",
+  "kow",
+  "kox",
+  "koy",
+  "koz",
+  "kpa",
+  "kpb",
+  "kpc",
+  "kpd",
+  "kpe",
+  "kpf",
+  "kpg",
+  "kph",
+  "kpi",
+  "kpj",
+  "kpk",
+  "kpl",
+  "kpm",
+  "kpn",
+  "kpo",
+  "kpp",
+  "kpq",
+  "kpr",
+  "kps",
+  "kpt",
+  "kpu",
+  "kpv",
+  "kpw",
+  "kpx",
+  "kpy",
+  "kpz",
+  "kqa",
+  "kqb",
+  "kqc",
+  "kqd",
+  "kqe",
+  "kqf",
+  "kqg",
+  "kqh",
+  "kqi",
+  "kqj",
+  "kqk",
+  "kql",
+  "kqm",
+  "kqn",
+  "kqo",
+  "kqp",
+  "kqq",
+  "kqr",
+  "kqs",
+  "kqt",
+  "kqu",
+  "kqv",
+  "kqw",
+  "kqx",
+  "kqy",
+  "kqz",
+  "kra",
+  "krb",
+  "krc",
+  "krd",
+  "kre",
+  "krf",
+  "krh",
+  "kri",
+  "krj",
+  "krk",
+  "krl",
+  "krm",
+  "krn",
+  "kro",
+  "krp",
+  "krr",
+  "krs",
+  "krt",
+  "kru",
+  "krv",
+  "krw",
+  "krx",
+  "kry",
+  "krz",
+  "ksa",
+  "ksb",
+  "ksc",
+  "ksd",
+  "kse",
+  "ksf",
+  "ksg",
+  "ksh",
+  "ksi",
+  "ksj",
+  "ksk",
+  "ksl",
+  "ksm",
+  "ksn",
+  "kso",
+  "ksp",
+  "ksq",
+  "ksr",
+  "kss",
+  "kst",
+  "ksu",
+  "ksv",
+  "ksw",
+  "ksx",
+  "ksy",
+  "ksz",
+  "kta",
+  "ktb",
+  "ktc",
+  "ktd",
+  "kte",
+  "ktf",
+  "ktg",
+  "kth",
+  "kti",
+  "ktj",
+  "ktk",
+  "ktl",
+  "ktm",
+  "ktn",
+  "kto",
+  "ktp",
+  "ktq",
+  "ktr",
+  "kts",
+  "ktt",
+  "ktu",
+  "ktv",
+  "ktw",
+  "ktx",
+  "kty",
+  "ktz",
+  "kub",
+  "kuc",
+  "kud",
+  "kue",
+  "kuf",
+  "kug",
+  "kuh",
+  "kui",
+  "kuj",
+  "kuk",
+  "kul",
+  "kum",
+  "kun",
+  "kuo",
+  "kup",
+  "kuq",
+  "kus",
+  "kut",
+  "kuu",
+  "kuv",
+  "kuw",
+  "kux",
+  "kuy",
+  "kuz",
+  "kva",
+  "kvb",
+  "kvc",
+  "kvd",
+  "kve",
+  "kvf",
+  "kvg",
+  "kvh",
+  "kvi",
+  "kvj",
+  "kvk",
+  "kvl",
+  "kvm",
+  "kvn",
+  "kvo",
+  "kvp",
+  "kvq",
+  "kvr",
+  "kvs",
+  "kvt",
+  "kvu",
+  "kvv",
+  "kvw",
+  "kvx",
+  "kvy",
+  "kvz",
+  "kwa",
+  "kwb",
+  "kwc",
+  "kwd",
+  "kwe",
+  "kwf",
+  "kwg",
+  "kwh",
+  "kwi",
+  "kwj",
+  "kwk",
+  "kwl",
+  "kwm",
+  "kwn",
+  "kwo",
+  "kwp",
+  "kwq",
+  "kwr",
+  "kws",
+  "kwt",
+  "kwu",
+  "kwv",
+  "kww",
+  "kwx",
+  "kwy",
+  "kwz",
+  "kxa",
+  "kxb",
+  "kxc",
+  "kxd",
+  "kxe",
+  "kxf",
+  "kxh",
+  "kxi",
+  "kxj",
+  "kxk",
+  "kxl",
+  "kxm",
+  "kxn",
+  "kxo",
+  "kxp",
+  "kxq",
+  "kxr",
+  "kxs",
+  "kxt",
+  "kxu",
+  "kxv",
+  "kxw",
+  "kxx",
+  "kxy",
+  "kxz",
+  "kya",
+  "kyb",
+  "kyc",
+  "kyd",
+  "kye",
+  "kyf",
+  "kyg",
+  "kyh",
+  "kyi",
+  "kyj",
+  "kyk",
+  "kyl",
+  "kym",
+  "kyn",
+  "kyo",
+  "kyp",
+  "kyq",
+  "kyr",
+  "kys",
+  "kyt",
+  "kyu",
+  "kyv",
+  "kyw",
+  "kyx",
+  "kyy",
+  "kyz",
+  "kza",
+  "kzb",
+  "kzc",
+  "kzd",
+  "kze",
+  "kzf",
+  "kzg",
+  "kzh",
+  "kzi",
+  "kzj",
+  "kzk",
+  "kzl",
+  "kzm",
+  "kzn",
+  "kzo",
+  "kzp",
+  "kzq",
+  "kzr",
+  "kzs",
+  "kzt",
+  "kzu",
+  "kzv",
+  "kzw",
+  "kzx",
+  "kzy",
+  "kzz",
+  "laa",
+  "lab",
+  "lac",
+  "lad",
+  "lae",
+  "laf",
+  "lag",
+  "lah",
+  "lai",
+  "laj",
+  "lak",
+  "lal",
+  "lam",
+  "lan",
+  "lap",
+  "laq",
+  "lar",
+  "las",
+  "lau",
+  "law",
+  "lax",
+  "lay",
+  "laz",
+  "lba",
+  "lbb",
+  "lbc",
+  "lbe",
+  "lbf",
+  "lbg",
+  "lbi",
+  "lbj",
+  "lbk",
+  "lbl",
+  "lbm",
+  "lbn",
+  "lbo",
+  "lbq",
+  "lbr",
+  "lbs",
+  "lbt",
+  "lbu",
+  "lbv",
+  "lbw",
+  "lbx",
+  "lby",
+  "lbz",
+  "lcc",
+  "lcd",
+  "lce",
+  "lcf",
+  "lch",
+  "lcl",
+  "lcm",
+  "lcp",
+  "lcq",
+  "lcs",
+  "lda",
+  "ldb",
+  "ldd",
+  "ldg",
+  "ldh",
+  "ldi",
+  "ldj",
+  "ldk",
+  "ldl",
+  "ldm",
+  "ldn",
+  "ldo",
+  "ldp",
+  "ldq",
+  "lea",
+  "leb",
+  "lec",
+  "led",
+  "lee",
+  "lef",
+  "leg",
+  "leh",
+  "lei",
+  "lej",
+  "lek",
+  "lel",
+  "lem",
+  "len",
+  "leo",
+  "lep",
+  "leq",
+  "ler",
+  "les",
+  "let",
+  "leu",
+  "lev",
+  "lew",
+  "lex",
+  "ley",
+  "lez",
+  "lfa",
+  "lfn",
+  "lga",
+  "lgb",
+  "lgg",
+  "lgh",
+  "lgi",
+  "lgk",
+  "lgl",
+  "lgm",
+  "lgn",
+  "lgq",
+  "lgr",
+  "lgt",
+  "lgu",
+  "lgz",
+  "lha",
+  "lhh",
+  "lhi",
+  "lhl",
+  "lhm",
+  "lhn",
+  "lhp",
+  "lhs",
+  "lht",
+  "lhu",
+  "lia",
+  "lib",
+  "lic",
+  "lid",
+  "lie",
+  "lif",
+  "lig",
+  "lih",
+  "lii",
+  "lij",
+  "lik",
+  "lil",
+  "lio",
+  "lip",
+  "liq",
+  "lir",
+  "lis",
+  "liu",
+  "liv",
+  "liw",
+  "lix",
+  "liy",
+  "liz",
+  "lja",
+  "lje",
+  "lji",
+  "ljl",
+  "ljp",
+  "ljw",
+  "ljx",
+  "lka",
+  "lkb",
+  "lkc",
+  "lkd",
+  "lke",
+  "lkh",
+  "lki",
+  "lkj",
+  "lkl",
+  "lkm",
+  "lkn",
+  "lko",
+  "lkr",
+  "lks",
+  "lkt",
+  "lku",
+  "lky",
+  "lla",
+  "llb",
+  "llc",
+  "lld",
+  "lle",
+  "llf",
+  "llg",
+  "llh",
+  "lli",
+  "llj",
+  "llk",
+  "lll",
+  "llm",
+  "lln",
+  "llo",
+  "llp",
+  "llq",
+  "lls",
+  "llu",
+  "llx",
+  "lma",
+  "lmb",
+  "lmc",
+  "lmd",
+  "lme",
+  "lmf",
+  "lmg",
+  "lmh",
+  "lmi",
+  "lmj",
+  "lmk",
+  "lml",
+  "lmm",
+  "lmn",
+  "lmo",
+  "lmp",
+  "lmq",
+  "lmr",
+  "lmu",
+  "lmv",
+  "lmw",
+  "lmx",
+  "lmy",
+  "lmz",
+  "lna",
+  "lnb",
+  "lnd",
+  "lng",
+  "lnh",
+  "lni",
+  "lnj",
+  "lnl",
+  "lnm",
+  "lnn",
+  "lno",
+  "lns",
+  "lnu",
+  "lnw",
+  "lnz",
+  "loa",
+  "lob",
+  "loc",
+  "loe",
+  "lof",
+  "log",
+  "loh",
+  "loi",
+  "loj",
+  "lok",
+  "lol",
+  "lom",
+  "lon",
+  "loo",
+  "lop",
+  "loq",
+  "lor",
+  "los",
+  "lot",
+  "lou",
+  "lov",
+  "low",
+  "lox",
+  "loy",
+  "loz",
+  "lpa",
+  "lpe",
+  "lpn",
+  "lpo",
+  "lpx",
+  "lra",
+  "lrc",
+  "lre",
+  "lrg",
+  "lri",
+  "lrk",
+  "lrl",
+  "lrm",
+  "lrn",
+  "lro",
+  "lrr",
+  "lrt",
+  "lrv",
+  "lrz",
+  "lsa",
+  "lsd",
+  "lse",
+  "lsg",
+  "lsh",
+  "lsi",
+  "lsl",
+  "lsm",
+  "lso",
+  "lsp",
+  "lsr",
+  "lss",
+  "lst",
+  "lsy",
+  "ltc",
+  "ltg",
+  "lti",
+  "ltn",
+  "lto",
+  "lts",
+  "ltu",
+  "lua",
+  "luc",
+  "lud",
+  "lue",
+  "luf",
+  "lui",
+  "luj",
+  "luk",
+  "lul",
+  "lum",
+  "lun",
+  "luo",
+  "lup",
+  "luq",
+  "lur",
+  "lus",
+  "lut",
+  "luu",
+  "luv",
+  "luw",
+  "luy",
+  "luz",
+  "lva",
+  "lvk",
+  "lvs",
+  "lvu",
+  "lwa",
+  "lwe",
+  "lwg",
+  "lwh",
+  "lwl",
+  "lwm",
+  "lwo",
+  "lwt",
+  "lwu",
+  "lww",
+  "lya",
+  "lyg",
+  "lyn",
+  "lzh",
+  "lzl",
+  "lzn",
+  "lzz",
+  "maa",
+  "mab",
+  "mad",
+  "mae",
+  "maf",
+  "mag",
+  "mai",
+  "maj",
+  "mak",
+  "mam",
+  "man",
+  "map",
+  "maq",
+  "mas",
+  "mat",
+  "mau",
+  "mav",
+  "maw",
+  "max",
+  "maz",
+  "mba",
+  "mbb",
+  "mbc",
+  "mbd",
+  "mbe",
+  "mbf",
+  "mbh",
+  "mbi",
+  "mbj",
+  "mbk",
+  "mbl",
+  "mbm",
+  "mbn",
+  "mbo",
+  "mbp",
+  "mbq",
+  "mbr",
+  "mbs",
+  "mbt",
+  "mbu",
+  "mbv",
+  "mbw",
+  "mbx",
+  "mby",
+  "mbz",
+  "mca",
+  "mcb",
+  "mcc",
+  "mcd",
+  "mce",
+  "mcf",
+  "mcg",
+  "mch",
+  "mci",
+  "mcj",
+  "mck",
+  "mcl",
+  "mcm",
+  "mcn",
+  "mco",
+  "mcp",
+  "mcq",
+  "mcr",
+  "mcs",
+  "mct",
+  "mcu",
+  "mcv",
+  "mcw",
+  "mcx",
+  "mcy",
+  "mcz",
+  "mda",
+  "mdb",
+  "mdc",
+  "mdd",
+  "mde",
+  "mdf",
+  "mdg",
+  "mdh",
+  "mdi",
+  "mdj",
+  "mdk",
+  "mdl",
+  "mdm",
+  "mdn",
+  "mdp",
+  "mdq",
+  "mdr",
+  "mds",
+  "mdt",
+  "mdu",
+  "mdv",
+  "mdw",
+  "mdx",
+  "mdy",
+  "mdz",
+  "mea",
+  "meb",
+  "mec",
+  "med",
+  "mee",
+  "mef",
+  "meg",
+  "meh",
+  "mei",
+  "mej",
+  "mek",
+  "mel",
+  "mem",
+  "men",
+  "meo",
+  "mep",
+  "meq",
+  "mer",
+  "mes",
+  "met",
+  "meu",
+  "mev",
+  "mew",
+  "mey",
+  "mez",
+  "mfa",
+  "mfb",
+  "mfc",
+  "mfd",
+  "mfe",
+  "mff",
+  "mfg",
+  "mfh",
+  "mfi",
+  "mfj",
+  "mfk",
+  "mfl",
+  "mfm",
+  "mfn",
+  "mfo",
+  "mfp",
+  "mfq",
+  "mfr",
+  "mfs",
+  "mft",
+  "mfu",
+  "mfv",
+  "mfw",
+  "mfx",
+  "mfy",
+  "mfz",
+  "mga",
+  "mgb",
+  "mgc",
+  "mgd",
+  "mge",
+  "mgf",
+  "mgg",
+  "mgh",
+  "mgi",
+  "mgj",
+  "mgk",
+  "mgl",
+  "mgm",
+  "mgn",
+  "mgo",
+  "mgp",
+  "mgq",
+  "mgr",
+  "mgs",
+  "mgt",
+  "mgu",
+  "mgv",
+  "mgw",
+  "mgx",
+  "mgy",
+  "mgz",
+  "mha",
+  "mhb",
+  "mhc",
+  "mhd",
+  "mhe",
+  "mhf",
+  "mhg",
+  "mhh",
+  "mhi",
+  "mhj",
+  "mhk",
+  "mhl",
+  "mhm",
+  "mhn",
+  "mho",
+  "mhp",
+  "mhq",
+  "mhr",
+  "mhs",
+  "mht",
+  "mhu",
+  "mhw",
+  "mhx",
+  "mhy",
+  "mhz",
+  "mia",
+  "mib",
+  "mic",
+  "mid",
+  "mie",
+  "mif",
+  "mig",
+  "mih",
+  "mii",
+  "mij",
+  "mik",
+  "mil",
+  "mim",
+  "min",
+  "mio",
+  "mip",
+  "miq",
+  "mir",
+  "mis",
+  "mit",
+  "miu",
+  "miw",
+  "mix",
+  "miy",
+  "miz",
+  "mja",
+  "mjb",
+  "mjc",
+  "mjd",
+  "mje",
+  "mjg",
+  "mjh",
+  "mji",
+  "mjj",
+  "mjk",
+  "mjl",
+  "mjm",
+  "mjn",
+  "mjo",
+  "mjp",
+  "mjq",
+  "mjr",
+  "mjs",
+  "mjt",
+  "mju",
+  "mjv",
+  "mjw",
+  "mjx",
+  "mjy",
+  "mjz",
+  "mka",
+  "mkb",
+  "mkc",
+  "mke",
+  "mkf",
+  "mkg",
+  "mkh",
+  "mki",
+  "mkj",
+  "mkk",
+  "mkl",
+  "mkm",
+  "mkn",
+  "mko",
+  "mkp",
+  "mkq",
+  "mkr",
+  "mks",
+  "mkt",
+  "mku",
+  "mkv",
+  "mkw",
+  "mkx",
+  "mky",
+  "mkz",
+  "mla",
+  "mlb",
+  "mlc",
+  "mld",
+  "mle",
+  "mlf",
+  "mlh",
+  "mli",
+  "mlj",
+  "mlk",
+  "mll",
+  "mlm",
+  "mln",
+  "mlo",
+  "mlp",
+  "mlq",
+  "mlr",
+  "mls",
+  "mlu",
+  "mlv",
+  "mlw",
+  "mlx",
+  "mlz",
+  "mma",
+  "mmb",
+  "mmc",
+  "mmd",
+  "mme",
+  "mmf",
+  "mmg",
+  "mmh",
+  "mmi",
+  "mmj",
+  "mmk",
+  "mml",
+  "mmm",
+  "mmn",
+  "mmo",
+  "mmp",
+  "mmq",
+  "mmr",
+  "mmt",
+  "mmu",
+  "mmv",
+  "mmw",
+  "mmx",
+  "mmy",
+  "mmz",
+  "mna",
+  "mnb",
+  "mnc",
+  "mnd",
+  "mne",
+  "mnf",
+  "mng",
+  "mnh",
+  "mni",
+  "mnj",
+  "mnk",
+  "mnl",
+  "mnm",
+  "mnn",
+  "mno",
+  "mnp",
+  "mnq",
+  "mnr",
+  "mns",
+  "mnt",
+  "mnu",
+  "mnv",
+  "mnw",
+  "mnx",
+  "mny",
+  "mnz",
+  "moa",
+  "moc",
+  "mod",
+  "moe",
+  "mof",
+  "mog",
+  "moh",
+  "moi",
+  "moj",
+  "mok",
+  "mom",
+  "moo",
+  "mop",
+  "moq",
+  "mor",
+  "mos",
+  "mot",
+  "mou",
+  "mov",
+  "mow",
+  "mox",
+  "moy",
+  "moz",
+  "mpa",
+  "mpb",
+  "mpc",
+  "mpd",
+  "mpe",
+  "mpg",
+  "mph",
+  "mpi",
+  "mpj",
+  "mpk",
+  "mpl",
+  "mpm",
+  "mpn",
+  "mpo",
+  "mpp",
+  "mpq",
+  "mpr",
+  "mps",
+  "mpt",
+  "mpu",
+  "mpv",
+  "mpw",
+  "mpx",
+  "mpy",
+  "mpz",
+  "mqa",
+  "mqb",
+  "mqc",
+  "mqe",
+  "mqf",
+  "mqg",
+  "mqh",
+  "mqi",
+  "mqj",
+  "mqk",
+  "mql",
+  "mqm",
+  "mqn",
+  "mqo",
+  "mqp",
+  "mqq",
+  "mqr",
+  "mqs",
+  "mqt",
+  "mqu",
+  "mqv",
+  "mqw",
+  "mqx",
+  "mqy",
+  "mqz",
+  "mra",
+  "mrb",
+  "mrc",
+  "mrd",
+  "mre",
+  "mrf",
+  "mrg",
+  "mrh",
+  "mrj",
+  "mrk",
+  "mrl",
+  "mrm",
+  "mrn",
+  "mro",
+  "mrp",
+  "mrq",
+  "mrr",
+  "mrs",
+  "mrt",
+  "mru",
+  "mrv",
+  "mrw",
+  "mrx",
+  "mry",
+  "mrz",
+  "msb",
+  "msc",
+  "msd",
+  "mse",
+  "msf",
+  "msg",
+  "msh",
+  "msi",
+  "msj",
+  "msk",
+  "msl",
+  "msm",
+  "msn",
+  "mso",
+  "msp",
+  "msq",
+  "msr",
+  "mss",
+  "mst",
+  "msu",
+  "msv",
+  "msw",
+  "msx",
+  "msy",
+  "msz",
+  "mta",
+  "mtb",
+  "mtc",
+  "mtd",
+  "mte",
+  "mtf",
+  "mtg",
+  "mth",
+  "mti",
+  "mtj",
+  "mtk",
+  "mtl",
+  "mtm",
+  "mtn",
+  "mto",
+  "mtp",
+  "mtq",
+  "mtr",
+  "mts",
+  "mtt",
+  "mtu",
+  "mtv",
+  "mtw",
+  "mtx",
+  "mty",
+  "mua",
+  "mub",
+  "muc",
+  "mud",
+  "mue",
+  "mug",
+  "muh",
+  "mui",
+  "muj",
+  "muk",
+  "mul",
+  "mum",
+  "mun",
+  "muo",
+  "mup",
+  "muq",
+  "mur",
+  "mus",
+  "mut",
+  "muu",
+  "muv",
+  "mux",
+  "muy",
+  "muz",
+  "mva",
+  "mvb",
+  "mvd",
+  "mve",
+  "mvf",
+  "mvg",
+  "mvh",
+  "mvi",
+  "mvk",
+  "mvl",
+  "mvm",
+  "mvn",
+  "mvo",
+  "mvp",
+  "mvq",
+  "mvr",
+  "mvs",
+  "mvt",
+  "mvu",
+  "mvv",
+  "mvw",
+  "mvx",
+  "mvy",
+  "mvz",
+  "mwa",
+  "mwb",
+  "mwc",
+  "mwd",
+  "mwe",
+  "mwf",
+  "mwg",
+  "mwh",
+  "mwi",
+  "mwj",
+  "mwk",
+  "mwl",
+  "mwm",
+  "mwn",
+  "mwo",
+  "mwp",
+  "mwq",
+  "mwr",
+  "mws",
+  "mwt",
+  "mwu",
+  "mwv",
+  "mww",
+  "mwx",
+  "mwy",
+  "mwz",
+  "mxa",
+  "mxb",
+  "mxc",
+  "mxd",
+  "mxe",
+  "mxf",
+  "mxg",
+  "mxh",
+  "mxi",
+  "mxj",
+  "mxk",
+  "mxl",
+  "mxm",
+  "mxn",
+  "mxo",
+  "mxp",
+  "mxq",
+  "mxr",
+  "mxs",
+  "mxt",
+  "mxu",
+  "mxv",
+  "mxw",
+  "mxx",
+  "mxy",
+  "mxz",
+  "myb",
+  "myc",
+  "myd",
+  "mye",
+  "myf",
+  "myg",
+  "myh",
+  "myi",
+  "myj",
+  "myk",
+  "myl",
+  "mym",
+  "myn",
+  "myo",
+  "myp",
+  "myq",
+  "myr",
+  "mys",
+  "myt",
+  "myu",
+  "myv",
+  "myw",
+  "myx",
+  "myy",
+  "myz",
+  "mza",
+  "mzb",
+  "mzc",
+  "mzd",
+  "mze",
+  "mzg",
+  "mzh",
+  "mzi",
+  "mzj",
+  "mzk",
+  "mzl",
+  "mzm",
+  "mzn",
+  "mzo",
+  "mzp",
+  "mzq",
+  "mzr",
+  "mzs",
+  "mzt",
+  "mzu",
+  "mzv",
+  "mzw",
+  "mzx",
+  "mzy",
+  "mzz",
+  "naa",
+  "nab",
+  "nac",
+  "nad",
+  "nae",
+  "naf",
+  "nag",
+  "nah",
+  "nai",
+  "naj",
+  "nak",
+  "nal",
+  "nam",
+  "nan",
+  "nao",
+  "nap",
+  "naq",
+  "nar",
+  "nas",
+  "nat",
+  "naw",
+  "nax",
+  "nay",
+  "naz",
+  "nba",
+  "nbb",
+  "nbc",
+  "nbd",
+  "nbe",
+  "nbf",
+  "nbg",
+  "nbh",
+  "nbi",
+  "nbj",
+  "nbk",
+  "nbm",
+  "nbn",
+  "nbo",
+  "nbp",
+  "nbq",
+  "nbr",
+  "nbs",
+  "nbt",
+  "nbu",
+  "nbv",
+  "nbw",
+  "nbx",
+  "nby",
+  "nca",
+  "ncb",
+  "ncc",
+  "ncd",
+  "nce",
+  "ncf",
+  "ncg",
+  "nch",
+  "nci",
+  "ncj",
+  "nck",
+  "ncl",
+  "ncm",
+  "ncn",
+  "nco",
+  "ncp",
+  "ncr",
+  "ncs",
+  "nct",
+  "ncu",
+  "ncx",
+  "ncz",
+  "nda",
+  "ndb",
+  "ndc",
+  "ndd",
+  "ndf",
+  "ndg",
+  "ndh",
+  "ndi",
+  "ndj",
+  "ndk",
+  "ndl",
+  "ndm",
+  "ndn",
+  "ndp",
+  "ndq",
+  "ndr",
+  "nds",
+  "ndt",
+  "ndu",
+  "ndv",
+  "ndw",
+  "ndx",
+  "ndy",
+  "ndz",
+  "nea",
+  "neb",
+  "nec",
+  "ned",
+  "nee",
+  "nef",
+  "neg",
+  "neh",
+  "nei",
+  "nej",
+  "nek",
+  "nem",
+  "nen",
+  "neo",
+  "neq",
+  "ner",
+  "nes",
+  "net",
+  "neu",
+  "nev",
+  "new",
+  "nex",
+  "ney",
+  "nez",
+  "nfa",
+  "nfd",
+  "nfl",
+  "nfr",
+  "nfu",
+  "nga",
+  "ngb",
+  "ngc",
+  "ngd",
+  "nge",
+  "ngf",
+  "ngg",
+  "ngh",
+  "ngi",
+  "ngj",
+  "ngk",
+  "ngl",
+  "ngm",
+  "ngn",
+  "ngo",
+  "ngp",
+  "ngq",
+  "ngr",
+  "ngs",
+  "ngt",
+  "ngu",
+  "ngv",
+  "ngw",
+  "ngx",
+  "ngy",
+  "ngz",
+  "nha",
+  "nhb",
+  "nhc",
+  "nhd",
+  "nhe",
+  "nhf",
+  "nhg",
+  "nhh",
+  "nhi",
+  "nhk",
+  "nhm",
+  "nhn",
+  "nho",
+  "nhp",
+  "nhq",
+  "nhr",
+  "nht",
+  "nhu",
+  "nhv",
+  "nhw",
+  "nhx",
+  "nhy",
+  "nhz",
+  "nia",
+  "nib",
+  "nic",
+  "nid",
+  "nie",
+  "nif",
+  "nig",
+  "nih",
+  "nii",
+  "nij",
+  "nik",
+  "nil",
+  "nim",
+  "nin",
+  "nio",
+  "niq",
+  "nir",
+  "nis",
+  "nit",
+  "niu",
+  "niv",
+  "niw",
+  "nix",
+  "niy",
+  "niz",
+  "nja",
+  "njb",
+  "njd",
+  "njh",
+  "nji",
+  "njj",
+  "njl",
+  "njm",
+  "njn",
+  "njo",
+  "njr",
+  "njs",
+  "njt",
+  "nju",
+  "njx",
+  "njy",
+  "njz",
+  "nka",
+  "nkb",
+  "nkc",
+  "nkd",
+  "nke",
+  "nkf",
+  "nkg",
+  "nkh",
+  "nki",
+  "nkj",
+  "nkk",
+  "nkm",
+  "nkn",
+  "nko",
+  "nkp",
+  "nkq",
+  "nkr",
+  "nks",
+  "nkt",
+  "nku",
+  "nkv",
+  "nkw",
+  "nkx",
+  "nkz",
+  "nla",
+  "nlc",
+  "nle",
+  "nlg",
+  "nli",
+  "nlj",
+  "nlk",
+  "nll",
+  "nln",
+  "nlo",
+  "nlq",
+  "nlr",
+  "nlu",
+  "nlv",
+  "nlw",
+  "nlx",
+  "nly",
+  "nlz",
+  "nma",
+  "nmb",
+  "nmc",
+  "nmd",
+  "nme",
+  "nmf",
+  "nmg",
+  "nmh",
+  "nmi",
+  "nmj",
+  "nmk",
+  "nml",
+  "nmm",
+  "nmn",
+  "nmo",
+  "nmp",
+  "nmq",
+  "nmr",
+  "nms",
+  "nmt",
+  "nmu",
+  "nmv",
+  "nmw",
+  "nmx",
+  "nmy",
+  "nmz",
+  "nna",
+  "nnb",
+  "nnc",
+  "nnd",
+  "nne",
+  "nnf",
+  "nng",
+  "nnh",
+  "nni",
+  "nnj",
+  "nnk",
+  "nnl",
+  "nnm",
+  "nnn",
+  "nnp",
+  "nnq",
+  "nnr",
+  "nns",
+  "nnt",
+  "nnu",
+  "nnv",
+  "nnw",
+  "nnx",
+  "nny",
+  "nnz",
+  "noa",
+  "noc",
+  "nod",
+  "noe",
+  "nof",
+  "nog",
+  "noh",
+  "noi",
+  "noj",
+  "nok",
+  "nol",
+  "nom",
+  "non",
+  "noo",
+  "nop",
+  "noq",
+  "nos",
+  "not",
+  "nou",
+  "nov",
+  "now",
+  "noy",
+  "noz",
+  "npa",
+  "npb",
+  "npg",
+  "nph",
+  "npi",
+  "npl",
+  "npn",
+  "npo",
+  "nps",
+  "npu",
+  "npy",
+  "nqg",
+  "nqk",
+  "nqm",
+  "nqn",
+  "nqo",
+  "nqq",
+  "nqy",
+  "nra",
+  "nrb",
+  "nrc",
+  "nre",
+  "nrf",
+  "nrg",
+  "nri",
+  "nrk",
+  "nrl",
+  "nrm",
+  "nrn",
+  "nrp",
+  "nrr",
+  "nrt",
+  "nru",
+  "nrx",
+  "nrz",
+  "nsa",
+  "nsc",
+  "nsd",
+  "nse",
+  "nsf",
+  "nsg",
+  "nsh",
+  "nsi",
+  "nsk",
+  "nsl",
+  "nsm",
+  "nsn",
+  "nso",
+  "nsp",
+  "nsq",
+  "nsr",
+  "nss",
+  "nst",
+  "nsu",
+  "nsv",
+  "nsw",
+  "nsx",
+  "nsy",
+  "nsz",
+  "ntd",
+  "nte",
+  "ntg",
+  "nti",
+  "ntj",
+  "ntk",
+  "ntm",
+  "nto",
+  "ntp",
+  "ntr",
+  "nts",
+  "ntu",
+  "ntw",
+  "ntx",
+  "nty",
+  "ntz",
+  "nua",
+  "nub",
+  "nuc",
+  "nud",
+  "nue",
+  "nuf",
+  "nug",
+  "nuh",
+  "nui",
+  "nuj",
+  "nuk",
+  "nul",
+  "num",
+  "nun",
+  "nuo",
+  "nup",
+  "nuq",
+  "nur",
+  "nus",
+  "nut",
+  "nuu",
+  "nuv",
+  "nuw",
+  "nux",
+  "nuy",
+  "nuz",
+  "nvh",
+  "nvm",
+  "nvo",
+  "nwa",
+  "nwb",
+  "nwc",
+  "nwe",
+  "nwg",
+  "nwi",
+  "nwm",
+  "nwo",
+  "nwr",
+  "nwx",
+  "nwy",
+  "nxa",
+  "nxd",
+  "nxe",
+  "nxg",
+  "nxi",
+  "nxk",
+  "nxl",
+  "nxm",
+  "nxn",
+  "nxo",
+  "nxq",
+  "nxr",
+  "nxu",
+  "nxx",
+  "nyb",
+  "nyc",
+  "nyd",
+  "nye",
+  "nyf",
+  "nyg",
+  "nyh",
+  "nyi",
+  "nyj",
+  "nyk",
+  "nyl",
+  "nym",
+  "nyn",
+  "nyo",
+  "nyp",
+  "nyq",
+  "nyr",
+  "nys",
+  "nyt",
+  "nyu",
+  "nyv",
+  "nyw",
+  "nyx",
+  "nyy",
+  "nza",
+  "nzb",
+  "nzi",
+  "nzk",
+  "nzm",
+  "nzs",
+  "nzu",
+  "nzy",
+  "nzz",
+  "oaa",
+  "oac",
+  "oar",
+  "oav",
+  "obi",
+  "obk",
+  "obl",
+  "obm",
+  "obo",
+  "obr",
+  "obt",
+  "obu",
+  "oca",
+  "och",
+  "oco",
+  "ocu",
+  "oda",
+  "odk",
+  "odt",
+  "odu",
+  "ofo",
+  "ofs",
+  "ofu",
+  "ogb",
+  "ogc",
+  "oge",
+  "ogg",
+  "ogo",
+  "ogu",
+  "oht",
+  "ohu",
+  "oia",
+  "oin",
+  "ojb",
+  "ojc",
+  "ojg",
+  "ojp",
+  "ojs",
+  "ojv",
+  "ojw",
+  "oka",
+  "okb",
+  "okd",
+  "oke",
+  "okg",
+  "okh",
+  "oki",
+  "okj",
+  "okk",
+  "okl",
+  "okm",
+  "okn",
+  "oko",
+  "okr",
+  "oks",
+  "oku",
+  "okv",
+  "okx",
+  "ola",
+  "old",
+  "ole",
+  "olk",
+  "olm",
+  "olo",
+  "olr",
+  "olt",
+  "olu",
+  "oma",
+  "omb",
+  "omc",
+  "ome",
+  "omg",
+  "omi",
+  "omk",
+  "oml",
+  "omn",
+  "omo",
+  "omp",
+  "omq",
+  "omr",
+  "omt",
+  "omu",
+  "omv",
+  "omw",
+  "omx",
+  "ona",
+  "onb",
+  "one",
+  "ong",
+  "oni",
+  "onj",
+  "onk",
+  "onn",
+  "ono",
+  "onp",
+  "onr",
+  "ons",
+  "ont",
+  "onu",
+  "onw",
+  "onx",
+  "ood",
+  "oog",
+  "oon",
+  "oor",
+  "oos",
+  "opa",
+  "opk",
+  "opm",
+  "opo",
+  "opt",
+  "opy",
+  "ora",
+  "orc",
+  "ore",
+  "org",
+  "orh",
+  "orn",
+  "oro",
+  "orr",
+  "ors",
+  "ort",
+  "oru",
+  "orv",
+  "orw",
+  "orx",
+  "ory",
+  "orz",
+  "osa",
+  "osc",
+  "osi",
+  "oso",
+  "osp",
+  "ost",
+  "osu",
+  "osx",
+  "ota",
+  "otb",
+  "otd",
+  "ote",
+  "oti",
+  "otk",
+  "otl",
+  "otm",
+  "otn",
+  "oto",
+  "otq",
+  "otr",
+  "ots",
+  "ott",
+  "otu",
+  "otw",
+  "otx",
+  "oty",
+  "otz",
+  "oua",
+  "oub",
+  "oue",
+  "oui",
+  "oum",
+  "oun",
+  "ovd",
+  "owi",
+  "owl",
+  "oyb",
+  "oyd",
+  "oym",
+  "oyy",
+  "ozm",
+  "paa",
+  "pab",
+  "pac",
+  "pad",
+  "pae",
+  "paf",
+  "pag",
+  "pah",
+  "pai",
+  "pak",
+  "pal",
+  "pam",
+  "pao",
+  "pap",
+  "paq",
+  "par",
+  "pas",
+  "pat",
+  "pau",
+  "pav",
+  "paw",
+  "pax",
+  "pay",
+  "paz",
+  "pbb",
+  "pbc",
+  "pbe",
+  "pbf",
+  "pbg",
+  "pbh",
+  "pbi",
+  "pbl",
+  "pbn",
+  "pbo",
+  "pbp",
+  "pbr",
+  "pbs",
+  "pbt",
+  "pbu",
+  "pbv",
+  "pby",
+  "pbz",
+  "pca",
+  "pcb",
+  "pcc",
+  "pcd",
+  "pce",
+  "pcf",
+  "pcg",
+  "pch",
+  "pci",
+  "pcj",
+  "pck",
+  "pcl",
+  "pcm",
+  "pcn",
+  "pcp",
+  "pcr",
+  "pcw",
+  "pda",
+  "pdc",
+  "pdi",
+  "pdn",
+  "pdo",
+  "pdt",
+  "pdu",
+  "pea",
+  "peb",
+  "ped",
+  "pee",
+  "pef",
+  "peg",
+  "peh",
+  "pei",
+  "pej",
+  "pek",
+  "pel",
+  "pem",
+  "peo",
+  "pep",
+  "peq",
+  "pes",
+  "pev",
+  "pex",
+  "pey",
+  "pez",
+  "pfa",
+  "pfe",
+  "pfl",
+  "pga",
+  "pgd",
+  "pgg",
+  "pgi",
+  "pgk",
+  "pgl",
+  "pgn",
+  "pgs",
+  "pgu",
+  "pgy",
+  "pgz",
+  "pha",
+  "phd",
+  "phg",
+  "phh",
+  "phi",
+  "phk",
+  "phl",
+  "phm",
+  "phn",
+  "pho",
+  "phq",
+  "phr",
+  "pht",
+  "phu",
+  "phv",
+  "phw",
+  "pia",
+  "pib",
+  "pic",
+  "pid",
+  "pie",
+  "pif",
+  "pig",
+  "pih",
+  "pii",
+  "pij",
+  "pil",
+  "pim",
+  "pin",
+  "pio",
+  "pip",
+  "pir",
+  "pis",
+  "pit",
+  "piu",
+  "piv",
+  "piw",
+  "pix",
+  "piy",
+  "piz",
+  "pjt",
+  "pka",
+  "pkb",
+  "pkc",
+  "pkg",
+  "pkh",
+  "pkn",
+  "pko",
+  "pkp",
+  "pkr",
+  "pks",
+  "pkt",
+  "pku",
+  "pla",
+  "plb",
+  "plc",
+  "pld",
+  "ple",
+  "plf",
+  "plg",
+  "plh",
+  "plj",
+  "plk",
+  "pll",
+  "pln",
+  "plo",
+  "plp",
+  "plq",
+  "plr",
+  "pls",
+  "plt",
+  "plu",
+  "plv",
+  "plw",
+  "ply",
+  "plz",
+  "pma",
+  "pmb",
+  "pmc",
+  "pmd",
+  "pme",
+  "pmf",
+  "pmh",
+  "pmi",
+  "pmj",
+  "pmk",
+  "pml",
+  "pmm",
+  "pmn",
+  "pmo",
+  "pmq",
+  "pmr",
+  "pms",
+  "pmt",
+  "pmu",
+  "pmw",
+  "pmx",
+  "pmy",
+  "pmz",
+  "pna",
+  "pnb",
+  "pnc",
+  "pne",
+  "png",
+  "pnh",
+  "pni",
+  "pnj",
+  "pnk",
+  "pnl",
+  "pnm",
+  "pnn",
+  "pno",
+  "pnp",
+  "pnq",
+  "pnr",
+  "pns",
+  "pnt",
+  "pnu",
+  "pnv",
+  "pnw",
+  "pnx",
+  "pny",
+  "pnz",
+  "poc",
+  "pod",
+  "poe",
+  "pof",
+  "pog",
+  "poh",
+  "poi",
+  "pok",
+  "pom",
+  "pon",
+  "poo",
+  "pop",
+  "poq",
+  "pos",
+  "pot",
+  "pov",
+  "pow",
+  "pox",
+  "poy",
+  "poz",
+  "ppa",
+  "ppe",
+  "ppi",
+  "ppk",
+  "ppl",
+  "ppm",
+  "ppn",
+  "ppo",
+  "ppp",
+  "ppq",
+  "ppr",
+  "pps",
+  "ppt",
+  "ppu",
+  "pqa",
+  "pqe",
+  "pqm",
+  "pqw",
+  "pra",
+  "prb",
+  "prc",
+  "prd",
+  "pre",
+  "prf",
+  "prg",
+  "prh",
+  "pri",
+  "prk",
+  "prl",
+  "prm",
+  "prn",
+  "pro",
+  "prp",
+  "prq",
+  "prr",
+  "prs",
+  "prt",
+  "pru",
+  "prw",
+  "prx",
+  "pry",
+  "prz",
+  "psa",
+  "psc",
+  "psd",
+  "pse",
+  "psg",
+  "psh",
+  "psi",
+  "psl",
+  "psm",
+  "psn",
+  "pso",
+  "psp",
+  "psq",
+  "psr",
+  "pss",
+  "pst",
+  "psu",
+  "psw",
+  "psy",
+  "pta",
+  "pth",
+  "pti",
+  "ptn",
+  "pto",
+  "ptp",
+  "ptq",
+  "ptr",
+  "ptt",
+  "ptu",
+  "ptv",
+  "ptw",
+  "pty",
+  "pua",
+  "pub",
+  "puc",
+  "pud",
+  "pue",
+  "puf",
+  "pug",
+  "pui",
+  "puj",
+  "puk",
+  "pum",
+  "puo",
+  "pup",
+  "puq",
+  "pur",
+  "put",
+  "puu",
+  "puw",
+  "pux",
+  "puy",
+  "puz",
+  "pwa",
+  "pwb",
+  "pwg",
+  "pwi",
+  "pwm",
+  "pwn",
+  "pwo",
+  "pwr",
+  "pww",
+  "pxm",
+  "pye",
+  "pym",
+  "pyn",
+  "pys",
+  "pyu",
+  "pyx",
+  "pyy",
+  "pzn",
+  "qaa..qtz",
+  "qua",
+  "qub",
+  "quc",
+  "qud",
+  "quf",
+  "qug",
+  "quh",
+  "qui",
+  "quk",
+  "qul",
+  "qum",
+  "qun",
+  "qup",
+  "quq",
+  "qur",
+  "qus",
+  "quv",
+  "quw",
+  "qux",
+  "quy",
+  "quz",
+  "qva",
+  "qvc",
+  "qve",
+  "qvh",
+  "qvi",
+  "qvj",
+  "qvl",
+  "qvm",
+  "qvn",
+  "qvo",
+  "qvp",
+  "qvs",
+  "qvw",
+  "qvy",
+  "qvz",
+  "qwa",
+  "qwc",
+  "qwe",
+  "qwh",
+  "qwm",
+  "qws",
+  "qwt",
+  "qxa",
+  "qxc",
+  "qxh",
+  "qxl",
+  "qxn",
+  "qxo",
+  "qxp",
+  "qxq",
+  "qxr",
+  "qxs",
+  "qxt",
+  "qxu",
+  "qxw",
+  "qya",
+  "qyp",
+  "raa",
+  "rab",
+  "rac",
+  "rad",
+  "raf",
+  "rag",
+  "rah",
+  "rai",
+  "raj",
+  "rak",
+  "ral",
+  "ram",
+  "ran",
+  "rao",
+  "rap",
+  "raq",
+  "rar",
+  "ras",
+  "rat",
+  "rau",
+  "rav",
+  "raw",
+  "rax",
+  "ray",
+  "raz",
+  "rbb",
+  "rbk",
+  "rbl",
+  "rbp",
+  "rcf",
+  "rdb",
+  "rea",
+  "reb",
+  "ree",
+  "reg",
+  "rei",
+  "rej",
+  "rel",
+  "rem",
+  "ren",
+  "rer",
+  "res",
+  "ret",
+  "rey",
+  "rga",
+  "rge",
+  "rgk",
+  "rgn",
+  "rgr",
+  "rgs",
+  "rgu",
+  "rhg",
+  "rhp",
+  "ria",
+  "rie",
+  "rif",
+  "ril",
+  "rim",
+  "rin",
+  "rir",
+  "rit",
+  "riu",
+  "rjg",
+  "rji",
+  "rjs",
+  "rka",
+  "rkb",
+  "rkh",
+  "rki",
+  "rkm",
+  "rkt",
+  "rkw",
+  "rma",
+  "rmb",
+  "rmc",
+  "rmd",
+  "rme",
+  "rmf",
+  "rmg",
+  "rmh",
+  "rmi",
+  "rmk",
+  "rml",
+  "rmm",
+  "rmn",
+  "rmo",
+  "rmp",
+  "rmq",
+  "rmr",
+  "rms",
+  "rmt",
+  "rmu",
+  "rmv",
+  "rmw",
+  "rmx",
+  "rmy",
+  "rmz",
+  "rna",
+  "rnd",
+  "rng",
+  "rnl",
+  "rnn",
+  "rnp",
+  "rnr",
+  "rnw",
+  "roa",
+  "rob",
+  "roc",
+  "rod",
+  "roe",
+  "rof",
+  "rog",
+  "rol",
+  "rom",
+  "roo",
+  "rop",
+  "ror",
+  "rou",
+  "row",
+  "rpn",
+  "rpt",
+  "rri",
+  "rro",
+  "rrt",
+  "rsb",
+  "rsi",
+  "rsl",
+  "rsm",
+  "rtc",
+  "rth",
+  "rtm",
+  "rts",
+  "rtw",
+  "rub",
+  "ruc",
+  "rue",
+  "ruf",
+  "rug",
+  "ruh",
+  "rui",
+  "ruk",
+  "ruo",
+  "rup",
+  "ruq",
+  "rut",
+  "ruu",
+  "ruy",
+  "ruz",
+  "rwa",
+  "rwk",
+  "rwm",
+  "rwo",
+  "rwr",
+  "rxd",
+  "rxw",
+  "ryn",
+  "rys",
+  "ryu",
+  "rzh",
+  "saa",
+  "sab",
+  "sac",
+  "sad",
+  "sae",
+  "saf",
+  "sah",
+  "sai",
+  "saj",
+  "sak",
+  "sal",
+  "sam",
+  "sao",
+  "sap",
+  "saq",
+  "sar",
+  "sas",
+  "sat",
+  "sau",
+  "sav",
+  "saw",
+  "sax",
+  "say",
+  "saz",
+  "sba",
+  "sbb",
+  "sbc",
+  "sbd",
+  "sbe",
+  "sbf",
+  "sbg",
+  "sbh",
+  "sbi",
+  "sbj",
+  "sbk",
+  "sbl",
+  "sbm",
+  "sbn",
+  "sbo",
+  "sbp",
+  "sbq",
+  "sbr",
+  "sbs",
+  "sbt",
+  "sbu",
+  "sbv",
+  "sbw",
+  "sbx",
+  "sby",
+  "sbz",
+  "sca",
+  "scb",
+  "sce",
+  "scf",
+  "scg",
+  "sch",
+  "sci",
+  "sck",
+  "scl",
+  "scn",
+  "sco",
+  "scp",
+  "scq",
+  "scs",
+  "scu",
+  "scv",
+  "scw",
+  "scx",
+  "sda",
+  "sdb",
+  "sdc",
+  "sde",
+  "sdf",
+  "sdg",
+  "sdh",
+  "sdj",
+  "sdk",
+  "sdl",
+  "sdm",
+  "sdn",
+  "sdo",
+  "sdp",
+  "sdr",
+  "sds",
+  "sdt",
+  "sdu",
+  "sdv",
+  "sdx",
+  "sdz",
+  "sea",
+  "seb",
+  "sec",
+  "sed",
+  "see",
+  "sef",
+  "seg",
+  "seh",
+  "sei",
+  "sej",
+  "sek",
+  "sel",
+  "sem",
+  "sen",
+  "seo",
+  "sep",
+  "seq",
+  "ser",
+  "ses",
+  "set",
+  "seu",
+  "sev",
+  "sew",
+  "sey",
+  "sez",
+  "sfb",
+  "sfe",
+  "sfm",
+  "sfs",
+  "sfw",
+  "sga",
+  "sgb",
+  "sgc",
+  "sgd",
+  "sge",
+  "sgg",
+  "sgh",
+  "sgi",
+  "sgj",
+  "sgk",
+  "sgl",
+  "sgm",
+  "sgn",
+  "sgo",
+  "sgp",
+  "sgr",
+  "sgs",
+  "sgt",
+  "sgu",
+  "sgw",
+  "sgx",
+  "sgy",
+  "sgz",
+  "sha",
+  "shb",
+  "shc",
+  "shd",
+  "she",
+  "shg",
+  "shh",
+  "shi",
+  "shj",
+  "shk",
+  "shl",
+  "shm",
+  "shn",
+  "sho",
+  "shp",
+  "shq",
+  "shr",
+  "shs",
+  "sht",
+  "shu",
+  "shv",
+  "shw",
+  "shx",
+  "shy",
+  "shz",
+  "sia",
+  "sib",
+  "sid",
+  "sie",
+  "sif",
+  "sig",
+  "sih",
+  "sii",
+  "sij",
+  "sik",
+  "sil",
+  "sim",
+  "sio",
+  "sip",
+  "siq",
+  "sir",
+  "sis",
+  "sit",
+  "siu",
+  "siv",
+  "siw",
+  "six",
+  "siy",
+  "siz",
+  "sja",
+  "sjb",
+  "sjd",
+  "sje",
+  "sjg",
+  "sjk",
+  "sjl",
+  "sjm",
+  "sjn",
+  "sjo",
+  "sjp",
+  "sjr",
+  "sjs",
+  "sjt",
+  "sju",
+  "sjw",
+  "ska",
+  "skb",
+  "skc",
+  "skd",
+  "ske",
+  "skf",
+  "skg",
+  "skh",
+  "ski",
+  "skj",
+  "skk",
+  "skm",
+  "skn",
+  "sko",
+  "skp",
+  "skq",
+  "skr",
+  "sks",
+  "skt",
+  "sku",
+  "skv",
+  "skw",
+  "skx",
+  "sky",
+  "skz",
+  "sla",
+  "slc",
+  "sld",
+  "sle",
+  "slf",
+  "slg",
+  "slh",
+  "sli",
+  "slj",
+  "sll",
+  "slm",
+  "sln",
+  "slp",
+  "slq",
+  "slr",
+  "sls",
+  "slt",
+  "slu",
+  "slw",
+  "slx",
+  "sly",
+  "slz",
+  "sma",
+  "smb",
+  "smc",
+  "smd",
+  "smf",
+  "smg",
+  "smh",
+  "smi",
+  "smj",
+  "smk",
+  "sml",
+  "smm",
+  "smn",
+  "smp",
+  "smq",
+  "smr",
+  "sms",
+  "smt",
+  "smu",
+  "smv",
+  "smw",
+  "smx",
+  "smy",
+  "smz",
+  "snb",
+  "snc",
+  "sne",
+  "snf",
+  "sng",
+  "snh",
+  "sni",
+  "snj",
+  "snk",
+  "snl",
+  "snm",
+  "snn",
+  "sno",
+  "snp",
+  "snq",
+  "snr",
+  "sns",
+  "snu",
+  "snv",
+  "snw",
+  "snx",
+  "sny",
+  "snz",
+  "soa",
+  "sob",
+  "soc",
+  "sod",
+  "soe",
+  "sog",
+  "soh",
+  "soi",
+  "soj",
+  "sok",
+  "sol",
+  "son",
+  "soo",
+  "sop",
+  "soq",
+  "sor",
+  "sos",
+  "sou",
+  "sov",
+  "sow",
+  "sox",
+  "soy",
+  "soz",
+  "spb",
+  "spc",
+  "spd",
+  "spe",
+  "spg",
+  "spi",
+  "spk",
+  "spl",
+  "spm",
+  "spn",
+  "spo",
+  "spp",
+  "spq",
+  "spr",
+  "sps",
+  "spt",
+  "spu",
+  "spv",
+  "spx",
+  "spy",
+  "sqa",
+  "sqh",
+  "sqj",
+  "sqk",
+  "sqm",
+  "sqn",
+  "sqo",
+  "sqq",
+  "sqr",
+  "sqs",
+  "sqt",
+  "squ",
+  "sra",
+  "srb",
+  "src",
+  "sre",
+  "srf",
+  "srg",
+  "srh",
+  "sri",
+  "srk",
+  "srl",
+  "srm",
+  "srn",
+  "sro",
+  "srq",
+  "srr",
+  "srs",
+  "srt",
+  "sru",
+  "srv",
+  "srw",
+  "srx",
+  "sry",
+  "srz",
+  "ssa",
+  "ssb",
+  "ssc",
+  "ssd",
+  "sse",
+  "ssf",
+  "ssg",
+  "ssh",
+  "ssi",
+  "ssj",
+  "ssk",
+  "ssl",
+  "ssm",
+  "ssn",
+  "sso",
+  "ssp",
+  "ssq",
+  "ssr",
+  "sss",
+  "sst",
+  "ssu",
+  "ssv",
+  "ssx",
+  "ssy",
+  "ssz",
+  "sta",
+  "stb",
+  "std",
+  "ste",
+  "stf",
+  "stg",
+  "sth",
+  "sti",
+  "stj",
+  "stk",
+  "stl",
+  "stm",
+  "stn",
+  "sto",
+  "stp",
+  "stq",
+  "str",
+  "sts",
+  "stt",
+  "stu",
+  "stv",
+  "stw",
+  "sty",
+  "sua",
+  "sub",
+  "suc",
+  "sue",
+  "sug",
+  "sui",
+  "suj",
+  "suk",
+  "sul",
+  "sum",
+  "suq",
+  "sur",
+  "sus",
+  "sut",
+  "suv",
+  "suw",
+  "sux",
+  "suy",
+  "suz",
+  "sva",
+  "svb",
+  "svc",
+  "sve",
+  "svk",
+  "svm",
+  "svr",
+  "svs",
+  "svx",
+  "swb",
+  "swc",
+  "swf",
+  "swg",
+  "swh",
+  "swi",
+  "swj",
+  "swk",
+  "swl",
+  "swm",
+  "swn",
+  "swo",
+  "swp",
+  "swq",
+  "swr",
+  "sws",
+  "swt",
+  "swu",
+  "swv",
+  "sww",
+  "swx",
+  "swy",
+  "sxb",
+  "sxc",
+  "sxe",
+  "sxg",
+  "sxk",
+  "sxl",
+  "sxm",
+  "sxn",
+  "sxo",
+  "sxr",
+  "sxs",
+  "sxu",
+  "sxw",
+  "sya",
+  "syb",
+  "syc",
+  "syd",
+  "syi",
+  "syk",
+  "syl",
+  "sym",
+  "syn",
+  "syo",
+  "syr",
+  "sys",
+  "syw",
+  "syx",
+  "syy",
+  "sza",
+  "szb",
+  "szc",
+  "szd",
+  "sze",
+  "szg",
+  "szl",
+  "szn",
+  "szp",
+  "szv",
+  "szw",
+  "taa",
+  "tab",
+  "tac",
+  "tad",
+  "tae",
+  "taf",
+  "tag",
+  "tai",
+  "taj",
+  "tak",
+  "tal",
+  "tan",
+  "tao",
+  "tap",
+  "taq",
+  "tar",
+  "tas",
+  "tau",
+  "tav",
+  "taw",
+  "tax",
+  "tay",
+  "taz",
+  "tba",
+  "tbb",
+  "tbc",
+  "tbd",
+  "tbe",
+  "tbf",
+  "tbg",
+  "tbh",
+  "tbi",
+  "tbj",
+  "tbk",
+  "tbl",
+  "tbm",
+  "tbn",
+  "tbo",
+  "tbp",
+  "tbq",
+  "tbr",
+  "tbs",
+  "tbt",
+  "tbu",
+  "tbv",
+  "tbw",
+  "tbx",
+  "tby",
+  "tbz",
+  "tca",
+  "tcb",
+  "tcc",
+  "tcd",
+  "tce",
+  "tcf",
+  "tcg",
+  "tch",
+  "tci",
+  "tck",
+  "tcl",
+  "tcm",
+  "tcn",
+  "tco",
+  "tcp",
+  "tcq",
+  "tcs",
+  "tct",
+  "tcu",
+  "tcw",
+  "tcx",
+  "tcy",
+  "tcz",
+  "tda",
+  "tdb",
+  "tdc",
+  "tdd",
+  "tde",
+  "tdf",
+  "tdg",
+  "tdh",
+  "tdi",
+  "tdj",
+  "tdk",
+  "tdl",
+  "tdm",
+  "tdn",
+  "tdo",
+  "tdq",
+  "tdr",
+  "tds",
+  "tdt",
+  "tdu",
+  "tdv",
+  "tdx",
+  "tdy",
+  "tea",
+  "teb",
+  "tec",
+  "ted",
+  "tee",
+  "tef",
+  "teg",
+  "teh",
+  "tei",
+  "tek",
+  "tem",
+  "ten",
+  "teo",
+  "tep",
+  "teq",
+  "ter",
+  "tes",
+  "tet",
+  "teu",
+  "tev",
+  "tew",
+  "tex",
+  "tey",
+  "tfi",
+  "tfn",
+  "tfo",
+  "tfr",
+  "tft",
+  "tga",
+  "tgb",
+  "tgc",
+  "tgd",
+  "tge",
+  "tgf",
+  "tgg",
+  "tgh",
+  "tgi",
+  "tgj",
+  "tgn",
+  "tgo",
+  "tgp",
+  "tgq",
+  "tgr",
+  "tgs",
+  "tgt",
+  "tgu",
+  "tgv",
+  "tgw",
+  "tgx",
+  "tgy",
+  "tgz",
+  "thc",
+  "thd",
+  "the",
+  "thf",
+  "thh",
+  "thi",
+  "thk",
+  "thl",
+  "thm",
+  "thn",
+  "thp",
+  "thq",
+  "thr",
+  "ths",
+  "tht",
+  "thu",
+  "thv",
+  "thw",
+  "thx",
+  "thy",
+  "thz",
+  "tia",
+  "tic",
+  "tid",
+  "tie",
+  "tif",
+  "tig",
+  "tih",
+  "tii",
+  "tij",
+  "tik",
+  "til",
+  "tim",
+  "tin",
+  "tio",
+  "tip",
+  "tiq",
+  "tis",
+  "tit",
+  "tiu",
+  "tiv",
+  "tiw",
+  "tix",
+  "tiy",
+  "tiz",
+  "tja",
+  "tjg",
+  "tji",
+  "tjl",
+  "tjm",
+  "tjn",
+  "tjo",
+  "tjs",
+  "tju",
+  "tjw",
+  "tka",
+  "tkb",
+  "tkd",
+  "tke",
+  "tkf",
+  "tkg",
+  "tkk",
+  "tkl",
+  "tkm",
+  "tkn",
+  "tkp",
+  "tkq",
+  "tkr",
+  "tks",
+  "tkt",
+  "tku",
+  "tkv",
+  "tkw",
+  "tkx",
+  "tkz",
+  "tla",
+  "tlb",
+  "tlc",
+  "tld",
+  "tlf",
+  "tlg",
+  "tlh",
+  "tli",
+  "tlj",
+  "tlk",
+  "tll",
+  "tlm",
+  "tln",
+  "tlo",
+  "tlp",
+  "tlq",
+  "tlr",
+  "tls",
+  "tlt",
+  "tlu",
+  "tlv",
+  "tlw",
+  "tlx",
+  "tly",
+  "tma",
+  "tmb",
+  "tmc",
+  "tmd",
+  "tme",
+  "tmf",
+  "tmg",
+  "tmh",
+  "tmi",
+  "tmj",
+  "tmk",
+  "tml",
+  "tmm",
+  "tmn",
+  "tmo",
+  "tmp",
+  "tmq",
+  "tmr",
+  "tms",
+  "tmt",
+  "tmu",
+  "tmv",
+  "tmw",
+  "tmy",
+  "tmz",
+  "tna",
+  "tnb",
+  "tnc",
+  "tnd",
+  "tne",
+  "tnf",
+  "tng",
+  "tnh",
+  "tni",
+  "tnk",
+  "tnl",
+  "tnm",
+  "tnn",
+  "tno",
+  "tnp",
+  "tnq",
+  "tnr",
+  "tns",
+  "tnt",
+  "tnu",
+  "tnv",
+  "tnw",
+  "tnx",
+  "tny",
+  "tnz",
+  "tob",
+  "toc",
+  "tod",
+  "toe",
+  "tof",
+  "tog",
+  "toh",
+  "toi",
+  "toj",
+  "tol",
+  "tom",
+  "too",
+  "top",
+  "toq",
+  "tor",
+  "tos",
+  "tou",
+  "tov",
+  "tow",
+  "tox",
+  "toy",
+  "toz",
+  "tpa",
+  "tpc",
+  "tpe",
+  "tpf",
+  "tpg",
+  "tpi",
+  "tpj",
+  "tpk",
+  "tpl",
+  "tpm",
+  "tpn",
+  "tpo",
+  "tpp",
+  "tpq",
+  "tpr",
+  "tpt",
+  "tpu",
+  "tpv",
+  "tpw",
+  "tpx",
+  "tpy",
+  "tpz",
+  "tqb",
+  "tql",
+  "tqm",
+  "tqn",
+  "tqo",
+  "tqp",
+  "tqq",
+  "tqr",
+  "tqt",
+  "tqu",
+  "tqw",
+  "tra",
+  "trb",
+  "trc",
+  "trd",
+  "tre",
+  "trf",
+  "trg",
+  "trh",
+  "tri",
+  "trj",
+  "trk",
+  "trl",
+  "trm",
+  "trn",
+  "tro",
+  "trp",
+  "trq",
+  "trr",
+  "trs",
+  "trt",
+  "tru",
+  "trv",
+  "trw",
+  "trx",
+  "try",
+  "trz",
+  "tsa",
+  "tsb",
+  "tsc",
+  "tsd",
+  "tse",
+  "tsf",
+  "tsg",
+  "tsh",
+  "tsi",
+  "tsj",
+  "tsk",
+  "tsl",
+  "tsm",
+  "tsp",
+  "tsq",
+  "tsr",
+  "tss",
+  "tst",
+  "tsu",
+  "tsv",
+  "tsw",
+  "tsx",
+  "tsy",
+  "tsz",
+  "tta",
+  "ttb",
+  "ttc",
+  "ttd",
+  "tte",
+  "ttf",
+  "ttg",
+  "tth",
+  "tti",
+  "ttj",
+  "ttk",
+  "ttl",
+  "ttm",
+  "ttn",
+  "tto",
+  "ttp",
+  "ttq",
+  "ttr",
+  "tts",
+  "ttt",
+  "ttu",
+  "ttv",
+  "ttw",
+  "tty",
+  "ttz",
+  "tua",
+  "tub",
+  "tuc",
+  "tud",
+  "tue",
+  "tuf",
+  "tug",
+  "tuh",
+  "tui",
+  "tuj",
+  "tul",
+  "tum",
+  "tun",
+  "tuo",
+  "tup",
+  "tuq",
+  "tus",
+  "tut",
+  "tuu",
+  "tuv",
+  "tuw",
+  "tux",
+  "tuy",
+  "tuz",
+  "tva",
+  "tvd",
+  "tve",
+  "tvk",
+  "tvl",
+  "tvm",
+  "tvn",
+  "tvo",
+  "tvs",
+  "tvt",
+  "tvu",
+  "tvw",
+  "tvy",
+  "twa",
+  "twb",
+  "twc",
+  "twd",
+  "twe",
+  "twf",
+  "twg",
+  "twh",
+  "twl",
+  "twm",
+  "twn",
+  "two",
+  "twp",
+  "twq",
+  "twr",
+  "twt",
+  "twu",
+  "tww",
+  "twx",
+  "twy",
+  "txa",
+  "txb",
+  "txc",
+  "txe",
+  "txg",
+  "txh",
+  "txi",
+  "txj",
+  "txm",
+  "txn",
+  "txo",
+  "txq",
+  "txr",
+  "txs",
+  "txt",
+  "txu",
+  "txx",
+  "txy",
+  "tya",
+  "tye",
+  "tyh",
+  "tyi",
+  "tyj",
+  "tyl",
+  "tyn",
+  "typ",
+  "tyr",
+  "tys",
+  "tyt",
+  "tyu",
+  "tyv",
+  "tyx",
+  "tyz",
+  "tza",
+  "tzh",
+  "tzj",
+  "tzl",
+  "tzm",
+  "tzn",
+  "tzo",
+  "tzx",
+  "uam",
+  "uan",
+  "uar",
+  "uba",
+  "ubi",
+  "ubl",
+  "ubr",
+  "ubu",
+  "uby",
+  "uda",
+  "ude",
+  "udg",
+  "udi",
+  "udj",
+  "udl",
+  "udm",
+  "udu",
+  "ues",
+  "ufi",
+  "uga",
+  "ugb",
+  "uge",
+  "ugn",
+  "ugo",
+  "ugy",
+  "uha",
+  "uhn",
+  "uis",
+  "uiv",
+  "uji",
+  "uka",
+  "ukg",
+  "ukh",
+  "ukl",
+  "ukp",
+  "ukq",
+  "uks",
+  "uku",
+  "ukw",
+  "uky",
+  "ula",
+  "ulb",
+  "ulc",
+  "ule",
+  "ulf",
+  "uli",
+  "ulk",
+  "ull",
+  "ulm",
+  "uln",
+  "ulu",
+  "ulw",
+  "uma",
+  "umb",
+  "umc",
+  "umd",
+  "umg",
+  "umi",
+  "umm",
+  "umn",
+  "umo",
+  "ump",
+  "umr",
+  "ums",
+  "umu",
+  "una",
+  "und",
+  "une",
+  "ung",
+  "unk",
+  "unm",
+  "unn",
+  "unp",
+  "unr",
+  "unu",
+  "unx",
+  "unz",
+  "uok",
+  "upi",
+  "upv",
+  "ura",
+  "urb",
+  "urc",
+  "ure",
+  "urf",
+  "urg",
+  "urh",
+  "uri",
+  "urj",
+  "urk",
+  "url",
+  "urm",
+  "urn",
+  "uro",
+  "urp",
+  "urr",
+  "urt",
+  "uru",
+  "urv",
+  "urw",
+  "urx",
+  "ury",
+  "urz",
+  "usa",
+  "ush",
+  "usi",
+  "usk",
+  "usp",
+  "usu",
+  "uta",
+  "ute",
+  "utp",
+  "utr",
+  "utu",
+  "uum",
+  "uun",
+  "uur",
+  "uuu",
+  "uve",
+  "uvh",
+  "uvl",
+  "uwa",
+  "uya",
+  "uzn",
+  "uzs",
+  "vaa",
+  "vae",
+  "vaf",
+  "vag",
+  "vah",
+  "vai",
+  "vaj",
+  "val",
+  "vam",
+  "van",
+  "vao",
+  "vap",
+  "var",
+  "vas",
+  "vau",
+  "vav",
+  "vay",
+  "vbb",
+  "vbk",
+  "vec",
+  "ved",
+  "vel",
+  "vem",
+  "veo",
+  "vep",
+  "ver",
+  "vgr",
+  "vgt",
+  "vic",
+  "vid",
+  "vif",
+  "vig",
+  "vil",
+  "vin",
+  "vis",
+  "vit",
+  "viv",
+  "vka",
+  "vki",
+  "vkj",
+  "vkk",
+  "vkl",
+  "vkm",
+  "vko",
+  "vkp",
+  "vkt",
+  "vku",
+  "vlp",
+  "vls",
+  "vma",
+  "vmb",
+  "vmc",
+  "vmd",
+  "vme",
+  "vmf",
+  "vmg",
+  "vmh",
+  "vmi",
+  "vmj",
+  "vmk",
+  "vml",
+  "vmm",
+  "vmp",
+  "vmq",
+  "vmr",
+  "vms",
+  "vmu",
+  "vmv",
+  "vmw",
+  "vmx",
+  "vmy",
+  "vmz",
+  "vnk",
+  "vnm",
+  "vnp",
+  "vor",
+  "vot",
+  "vra",
+  "vro",
+  "vrs",
+  "vrt",
+  "vsi",
+  "vsl",
+  "vsv",
+  "vto",
+  "vum",
+  "vun",
+  "vut",
+  "vwa",
+  "waa",
+  "wab",
+  "wac",
+  "wad",
+  "wae",
+  "waf",
+  "wag",
+  "wah",
+  "wai",
+  "waj",
+  "wak",
+  "wal",
+  "wam",
+  "wan",
+  "wao",
+  "wap",
+  "waq",
+  "war",
+  "was",
+  "wat",
+  "wau",
+  "wav",
+  "waw",
+  "wax",
+  "way",
+  "waz",
+  "wba",
+  "wbb",
+  "wbe",
+  "wbf",
+  "wbh",
+  "wbi",
+  "wbj",
+  "wbk",
+  "wbl",
+  "wbm",
+  "wbp",
+  "wbq",
+  "wbr",
+  "wbt",
+  "wbv",
+  "wbw",
+  "wca",
+  "wci",
+  "wdd",
+  "wdg",
+  "wdj",
+  "wdk",
+  "wdu",
+  "wdy",
+  "wea",
+  "wec",
+  "wed",
+  "weg",
+  "weh",
+  "wei",
+  "wem",
+  "wen",
+  "weo",
+  "wep",
+  "wer",
+  "wes",
+  "wet",
+  "weu",
+  "wew",
+  "wfg",
+  "wga",
+  "wgb",
+  "wgg",
+  "wgi",
+  "wgo",
+  "wgu",
+  "wgw",
+  "wgy",
+  "wha",
+  "whg",
+  "whk",
+  "whu",
+  "wib",
+  "wic",
+  "wie",
+  "wif",
+  "wig",
+  "wih",
+  "wii",
+  "wij",
+  "wik",
+  "wil",
+  "wim",
+  "win",
+  "wir",
+  "wit",
+  "wiu",
+  "wiv",
+  "wiw",
+  "wiy",
+  "wja",
+  "wji",
+  "wka",
+  "wkb",
+  "wkd",
+  "wkl",
+  "wku",
+  "wkw",
+  "wky",
+  "wla",
+  "wlc",
+  "wle",
+  "wlg",
+  "wli",
+  "wlk",
+  "wll",
+  "wlm",
+  "wlo",
+  "wlr",
+  "wls",
+  "wlu",
+  "wlv",
+  "wlw",
+  "wlx",
+  "wly",
+  "wma",
+  "wmb",
+  "wmc",
+  "wmd",
+  "wme",
+  "wmh",
+  "wmi",
+  "wmm",
+  "wmn",
+  "wmo",
+  "wms",
+  "wmt",
+  "wmw",
+  "wmx",
+  "wnb",
+  "wnc",
+  "wnd",
+  "wne",
+  "wng",
+  "wni",
+  "wnk",
+  "wnm",
+  "wnn",
+  "wno",
+  "wnp",
+  "wnu",
+  "wnw",
+  "wny",
+  "woa",
+  "wob",
+  "woc",
+  "wod",
+  "woe",
+  "wof",
+  "wog",
+  "woi",
+  "wok",
+  "wom",
+  "won",
+  "woo",
+  "wor",
+  "wos",
+  "wow",
+  "woy",
+  "wpc",
+  "wra",
+  "wrb",
+  "wrd",
+  "wrg",
+  "wrh",
+  "wri",
+  "wrk",
+  "wrl",
+  "wrm",
+  "wrn",
+  "wro",
+  "wrp",
+  "wrr",
+  "wrs",
+  "wru",
+  "wrv",
+  "wrw",
+  "wrx",
+  "wry",
+  "wrz",
+  "wsa",
+  "wsg",
+  "wsi",
+  "wsk",
+  "wsr",
+  "wss",
+  "wsu",
+  "wsv",
+  "wtf",
+  "wth",
+  "wti",
+  "wtk",
+  "wtm",
+  "wtw",
+  "wua",
+  "wub",
+  "wud",
+  "wuh",
+  "wul",
+  "wum",
+  "wun",
+  "wur",
+  "wut",
+  "wuu",
+  "wuv",
+  "wux",
+  "wuy",
+  "wwa",
+  "wwb",
+  "wwo",
+  "wwr",
+  "www",
+  "wxa",
+  "wxw",
+  "wya",
+  "wyb",
+  "wyi",
+  "wym",
+  "wyr",
+  "wyy",
+  "xaa",
+  "xab",
+  "xac",
+  "xad",
+  "xae",
+  "xag",
+  "xai",
+  "xaj",
+  "xak",
+  "xal",
+  "xam",
+  "xan",
+  "xao",
+  "xap",
+  "xaq",
+  "xar",
+  "xas",
+  "xat",
+  "xau",
+  "xav",
+  "xaw",
+  "xay",
+  "xba",
+  "xbb",
+  "xbc",
+  "xbd",
+  "xbe",
+  "xbg",
+  "xbi",
+  "xbj",
+  "xbm",
+  "xbn",
+  "xbo",
+  "xbp",
+  "xbr",
+  "xbw",
+  "xbx",
+  "xby",
+  "xcb",
+  "xcc",
+  "xce",
+  "xcg",
+  "xch",
+  "xcl",
+  "xcm",
+  "xcn",
+  "xco",
+  "xcr",
+  "xct",
+  "xcu",
+  "xcv",
+  "xcw",
+  "xcy",
+  "xda",
+  "xdc",
+  "xdk",
+  "xdm",
+  "xdy",
+  "xeb",
+  "xed",
+  "xeg",
+  "xel",
+  "xem",
+  "xep",
+  "xer",
+  "xes",
+  "xet",
+  "xeu",
+  "xfa",
+  "xga",
+  "xgb",
+  "xgd",
+  "xgf",
+  "xgg",
+  "xgi",
+  "xgl",
+  "xgm",
+  "xgn",
+  "xgr",
+  "xgu",
+  "xgw",
+  "xha",
+  "xhc",
+  "xhd",
+  "xhe",
+  "xhr",
+  "xht",
+  "xhu",
+  "xhv",
+  "xia",
+  "xib",
+  "xii",
+  "xil",
+  "xin",
+  "xip",
+  "xir",
+  "xis",
+  "xiv",
+  "xiy",
+  "xjb",
+  "xjt",
+  "xka",
+  "xkb",
+  "xkc",
+  "xkd",
+  "xke",
+  "xkf",
+  "xkg",
+  "xkh",
+  "xki",
+  "xkj",
+  "xkk",
+  "xkl",
+  "xkn",
+  "xko",
+  "xkp",
+  "xkq",
+  "xkr",
+  "xks",
+  "xkt",
+  "xku",
+  "xkv",
+  "xkw",
+  "xkx",
+  "xky",
+  "xkz",
+  "xla",
+  "xlb",
+  "xlc",
+  "xld",
+  "xle",
+  "xlg",
+  "xli",
+  "xln",
+  "xlo",
+  "xlp",
+  "xls",
+  "xlu",
+  "xly",
+  "xma",
+  "xmb",
+  "xmc",
+  "xmd",
+  "xme",
+  "xmf",
+  "xmg",
+  "xmh",
+  "xmj",
+  "xmk",
+  "xml",
+  "xmm",
+  "xmn",
+  "xmo",
+  "xmp",
+  "xmq",
+  "xmr",
+  "xms",
+  "xmt",
+  "xmu",
+  "xmv",
+  "xmw",
+  "xmx",
+  "xmy",
+  "xmz",
+  "xna",
+  "xnb",
+  "xnd",
+  "xng",
+  "xnh",
+  "xni",
+  "xnk",
+  "xnn",
+  "xno",
+  "xnr",
+  "xns",
+  "xnt",
+  "xnu",
+  "xny",
+  "xnz",
+  "xoc",
+  "xod",
+  "xog",
+  "xoi",
+  "xok",
+  "xom",
+  "xon",
+  "xoo",
+  "xop",
+  "xor",
+  "xow",
+  "xpa",
+  "xpc",
+  "xpe",
+  "xpg",
+  "xpi",
+  "xpj",
+  "xpk",
+  "xpm",
+  "xpn",
+  "xpo",
+  "xpp",
+  "xpq",
+  "xpr",
+  "xps",
+  "xpt",
+  "xpu",
+  "xpy",
+  "xqa",
+  "xqt",
+  "xra",
+  "xrb",
+  "xrd",
+  "xre",
+  "xrg",
+  "xri",
+  "xrm",
+  "xrn",
+  "xrq",
+  "xrr",
+  "xrt",
+  "xru",
+  "xrw",
+  "xsa",
+  "xsb",
+  "xsc",
+  "xsd",
+  "xse",
+  "xsh",
+  "xsi",
+  "xsj",
+  "xsl",
+  "xsm",
+  "xsn",
+  "xso",
+  "xsp",
+  "xsq",
+  "xsr",
+  "xss",
+  "xsu",
+  "xsv",
+  "xsy",
+  "xta",
+  "xtb",
+  "xtc",
+  "xtd",
+  "xte",
+  "xtg",
+  "xth",
+  "xti",
+  "xtj",
+  "xtl",
+  "xtm",
+  "xtn",
+  "xto",
+  "xtp",
+  "xtq",
+  "xtr",
+  "xts",
+  "xtt",
+  "xtu",
+  "xtv",
+  "xtw",
+  "xty",
+  "xtz",
+  "xua",
+  "xub",
+  "xud",
+  "xug",
+  "xuj",
+  "xul",
+  "xum",
+  "xun",
+  "xuo",
+  "xup",
+  "xur",
+  "xut",
+  "xuu",
+  "xve",
+  "xvi",
+  "xvn",
+  "xvo",
+  "xvs",
+  "xwa",
+  "xwc",
+  "xwd",
+  "xwe",
+  "xwg",
+  "xwj",
+  "xwk",
+  "xwl",
+  "xwo",
+  "xwr",
+  "xwt",
+  "xww",
+  "xxb",
+  "xxk",
+  "xxm",
+  "xxr",
+  "xxt",
+  "xya",
+  "xyb",
+  "xyj",
+  "xyk",
+  "xyl",
+  "xyt",
+  "xyy",
+  "xzh",
+  "xzm",
+  "xzp",
+  "yaa",
+  "yab",
+  "yac",
+  "yad",
+  "yae",
+  "yaf",
+  "yag",
+  "yah",
+  "yai",
+  "yaj",
+  "yak",
+  "yal",
+  "yam",
+  "yan",
+  "yao",
+  "yap",
+  "yaq",
+  "yar",
+  "yas",
+  "yat",
+  "yau",
+  "yav",
+  "yaw",
+  "yax",
+  "yay",
+  "yaz",
+  "yba",
+  "ybb",
+  "ybd",
+  "ybe",
+  "ybh",
+  "ybi",
+  "ybj",
+  "ybk",
+  "ybl",
+  "ybm",
+  "ybn",
+  "ybo",
+  "ybx",
+  "yby",
+  "ych",
+  "ycl",
+  "ycn",
+  "ycp",
+  "yda",
+  "ydd",
+  "yde",
+  "ydg",
+  "ydk",
+  "yds",
+  "yea",
+  "yec",
+  "yee",
+  "yei",
+  "yej",
+  "yel",
+  "yen",
+  "yer",
+  "yes",
+  "yet",
+  "yeu",
+  "yev",
+  "yey",
+  "yga",
+  "ygi",
+  "ygl",
+  "ygm",
+  "ygp",
+  "ygr",
+  "ygs",
+  "ygu",
+  "ygw",
+  "yha",
+  "yhd",
+  "yhl",
+  "yhs",
+  "yia",
+  "yif",
+  "yig",
+  "yih",
+  "yii",
+  "yij",
+  "yik",
+  "yil",
+  "yim",
+  "yin",
+  "yip",
+  "yiq",
+  "yir",
+  "yis",
+  "yit",
+  "yiu",
+  "yiv",
+  "yix",
+  "yiy",
+  "yiz",
+  "yka",
+  "ykg",
+  "yki",
+  "ykk",
+  "ykl",
+  "ykm",
+  "ykn",
+  "yko",
+  "ykr",
+  "ykt",
+  "yku",
+  "yky",
+  "yla",
+  "ylb",
+  "yle",
+  "ylg",
+  "yli",
+  "yll",
+  "ylm",
+  "yln",
+  "ylo",
+  "ylr",
+  "ylu",
+  "yly",
+  "yma",
+  "ymb",
+  "ymc",
+  "ymd",
+  "yme",
+  "ymg",
+  "ymh",
+  "ymi",
+  "ymk",
+  "yml",
+  "ymm",
+  "ymn",
+  "ymo",
+  "ymp",
+  "ymq",
+  "ymr",
+  "yms",
+  "ymt",
+  "ymx",
+  "ymz",
+  "yna",
+  "ynd",
+  "yne",
+  "yng",
+  "ynh",
+  "ynk",
+  "ynl",
+  "ynn",
+  "yno",
+  "ynq",
+  "yns",
+  "ynu",
+  "yob",
+  "yog",
+  "yoi",
+  "yok",
+  "yol",
+  "yom",
+  "yon",
+  "yos",
+  "yot",
+  "yox",
+  "yoy",
+  "ypa",
+  "ypb",
+  "ypg",
+  "yph",
+  "ypk",
+  "ypm",
+  "ypn",
+  "ypo",
+  "ypp",
+  "ypz",
+  "yra",
+  "yrb",
+  "yre",
+  "yri",
+  "yrk",
+  "yrl",
+  "yrm",
+  "yrn",
+  "yro",
+  "yrs",
+  "yrw",
+  "yry",
+  "ysc",
+  "ysd",
+  "ysg",
+  "ysl",
+  "ysn",
+  "yso",
+  "ysp",
+  "ysr",
+  "yss",
+  "ysy",
+  "yta",
+  "ytl",
+  "ytp",
+  "ytw",
+  "yty",
+  "yua",
+  "yub",
+  "yuc",
+  "yud",
+  "yue",
+  "yuf",
+  "yug",
+  "yui",
+  "yuj",
+  "yuk",
+  "yul",
+  "yum",
+  "yun",
+  "yup",
+  "yuq",
+  "yur",
+  "yut",
+  "yuu",
+  "yuw",
+  "yux",
+  "yuy",
+  "yuz",
+  "yva",
+  "yvt",
+  "ywa",
+  "ywg",
+  "ywl",
+  "ywn",
+  "ywq",
+  "ywr",
+  "ywt",
+  "ywu",
+  "yww",
+  "yxa",
+  "yxg",
+  "yxl",
+  "yxm",
+  "yxu",
+  "yxy",
+  "yyr",
+  "yyu",
+  "yyz",
+  "yzg",
+  "yzk",
+  "zaa",
+  "zab",
+  "zac",
+  "zad",
+  "zae",
+  "zaf",
+  "zag",
+  "zah",
+  "zai",
+  "zaj",
+  "zak",
+  "zal",
+  "zam",
+  "zao",
+  "zap",
+  "zaq",
+  "zar",
+  "zas",
+  "zat",
+  "zau",
+  "zav",
+  "zaw",
+  "zax",
+  "zay",
+  "zaz",
+  "zbc",
+  "zbe",
+  "zbl",
+  "zbt",
+  "zbw",
+  "zca",
+  "zch",
+  "zdj",
+  "zea",
+  "zeg",
+  "zeh",
+  "zen",
+  "zga",
+  "zgb",
+  "zgh",
+  "zgm",
+  "zgn",
+  "zgr",
+  "zhb",
+  "zhd",
+  "zhi",
+  "zhn",
+  "zhw",
+  "zhx",
+  "zia",
+  "zib",
+  "zik",
+  "zil",
+  "zim",
+  "zin",
+  "zir",
+  "ziw",
+  "ziz",
+  "zka",
+  "zkb",
+  "zkd",
+  "zkg",
+  "zkh",
+  "zkk",
+  "zkn",
+  "zko",
+  "zkp",
+  "zkr",
+  "zkt",
+  "zku",
+  "zkv",
+  "zkz",
+  "zle",
+  "zlj",
+  "zlm",
+  "zln",
+  "zlq",
+  "zls",
+  "zlw",
+  "zma",
+  "zmb",
+  "zmc",
+  "zmd",
+  "zme",
+  "zmf",
+  "zmg",
+  "zmh",
+  "zmi",
+  "zmj",
+  "zmk",
+  "zml",
+  "zmm",
+  "zmn",
+  "zmo",
+  "zmp",
+  "zmq",
+  "zmr",
+  "zms",
+  "zmt",
+  "zmu",
+  "zmv",
+  "zmw",
+  "zmx",
+  "zmy",
+  "zmz",
+  "zna",
+  "znd",
+  "zne",
+  "zng",
+  "znk",
+  "zns",
+  "zoc",
+  "zoh",
+  "zom",
+  "zoo",
+  "zoq",
+  "zor",
+  "zos",
+  "zpa",
+  "zpb",
+  "zpc",
+  "zpd",
+  "zpe",
+  "zpf",
+  "zpg",
+  "zph",
+  "zpi",
+  "zpj",
+  "zpk",
+  "zpl",
+  "zpm",
+  "zpn",
+  "zpo",
+  "zpp",
+  "zpq",
+  "zpr",
+  "zps",
+  "zpt",
+  "zpu",
+  "zpv",
+  "zpw",
+  "zpx",
+  "zpy",
+  "zpz",
+  "zqe",
+  "zra",
+  "zrg",
+  "zrn",
+  "zro",
+  "zrp",
+  "zrs",
+  "zsa",
+  "zsk",
+  "zsl",
+  "zsm",
+  "zsr",
+  "zsu",
+  "zte",
+  "ztg",
+  "ztl",
+  "ztm",
+  "ztn",
+  "ztp",
+  "ztq",
+  "zts",
+  "ztt",
+  "ztu",
+  "ztx",
+  "zty",
+  "zua",
+  "zuh",
+  "zum",
+  "zun",
+  "zuy",
+  "zwa",
+  "zxx",
+  "zyb",
+  "zyg",
+  "zyj",
+  "zyn",
+  "zyp",
+  "zza",
+  "zzj"
  ],
  "evaluate": "valid-lang.js",
  "metadata": {
   "impact": "serious",
   "messages": {
-    "pass": "Value of lang attribute is included in the list of valid languages",
-    "fail": "Value of lang attribute not included in the list of valid languages"
+   "pass": "Value of lang attribute is included in the list of valid languages",
+   "fail": "Value of lang attribute not included in the list of valid languages"
   }
  }
-}
+}
\ No newline at end of file
diff --git a/test/integration/rules/valid-lang/valid-lang.html b/test/integration/rules/valid-lang/valid-lang.html
index 545947c2d2..5a824cca12 100644
--- a/test/integration/rules/valid-lang/valid-lang.html
+++ b/test/integration/rules/valid-lang/valid-lang.html
@@ -4,6 +4,7 @@
 <p xml:lang="en-US" lang="en-US" id="pass3">Mix</p>
 <p xml:lang="de" lang="de" id="pass4">Deutsch</p>
 <p lang="af" id="pass5">Afrikaans</p>
+<p lang="oma" id="pass6">Omaha (3 letter)</p>
 
 <p lang="gibberish-US" id="fail1">Not English</p>
 <p xml:lang="gibberish-US" id="fail2">Not English</p>
diff --git a/test/integration/rules/valid-lang/valid-lang.json b/test/integration/rules/valid-lang/valid-lang.json
index ed8c7e0357..bc545405dc 100644
--- a/test/integration/rules/valid-lang/valid-lang.json
+++ b/test/integration/rules/valid-lang/valid-lang.json
@@ -2,5 +2,5 @@
 	"description": "valid-lang test",
 	"rule": "valid-lang",
 	"violations": [["#fail1"], ["#fail2"], ["#fail3"]],
-	"passes": [["#pass1"], ["#pass2"], ["#pass3"], ["#pass4"], ["#pass5"]]
+	"passes": [["#pass1"], ["#pass2"], ["#pass3"], ["#pass4"], ["#pass5"], ["#pass6"]]
 }

From 13ca5c05f9b8a19485b0104923413a66cb2aef14 Mon Sep 17 00:00:00 2001
From: Jaime Iniesta <jaimeiniesta@gmail.com>
Date: Thu, 16 Feb 2017 20:41:40 +0100
Subject: [PATCH 40/40] Fix typo on API.md (#284)

`allyCheck` => `a11yCheck`.
---
 doc/API.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/API.md b/doc/API.md
index 0596eaac67..4bee0fc006 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -415,7 +415,7 @@ This will either be null or an object which is an instance of Error. If you are
 
 #### Results Object
 
-The callback function passed in as the third parameter of `axe.allyCheck` runs on the results object. This object has two components – a passes array and a violations array.  The passes array keeps track of all the passed tests, along with detailed information on each one. This leads to more efficient testing, especially when used in conjunction with manual testing, as the user can easily find out what tests have already been passed. Similarly, the violations array keeps track of all the failed tests, along with detailed information on each one.
+The callback function passed in as the third parameter of `axe.a11yCheck` runs on the results object. This object has two components – a passes array and a violations array.  The passes array keeps track of all the passed tests, along with detailed information on each one. This leads to more efficient testing, especially when used in conjunction with manual testing, as the user can easily find out what tests have already been passed. Similarly, the violations array keeps track of all the failed tests, along with detailed information on each one.
 
 ###### `url`
 
@@ -440,7 +440,7 @@ Each object returned in these arrays have the following properties:
 * `helpUrl` - URL that provides more information about the specifics of the violation. Links to a page on the Deque University site.
 * `id` - Unique identifier for the rule; [see the list of rules](rule-descriptions.md)
 * `impact` - How serious the violation is. Can be one of "minor", "moderate", "serious", or "critical" if the Rule failed or `null` if the check passed
-* `tags` - Array of tags that this rule is assigned. These tags can be used in the option structure to select which rules are run ([see `axe.allyCheck` parameters below for more information](#a11ycheck-parameters)).
+* `tags` - Array of tags that this rule is assigned. These tags can be used in the option structure to select which rules are run ([see `axe.a11yCheck` parameters below for more information](#a11ycheck-parameters)).
 * `nodes` - Array of all elements the Rule tested
 	* `html` - Snippet of HTML of the Element
 	* `impact` - How serious the violation is. Can be one of "minor", "moderate", "serious", or "critical" if the test failed or `null` if the check passed