diff --git a/grunt/tasks/test.js b/grunt/tasks/test.js
index 81ad07730..d2c5a1802 100644
--- a/grunt/tasks/test.js
+++ b/grunt/tasks/test.js
@@ -3,6 +3,10 @@ module.exports = function test (grunt) {
 	grunt.registerTask('test', 'run jshint, qunit source w/ coverage, and validate HTML',
 		['jshint', 'connect:testServer', 'qunit:noMoment', 'qunit:globals', 'test-dist', 'htmllint']);
 
+	grunt.registerTask('unittest', 'Just unit test the dist without all the fluff',
+		['connect:testServer', 'test-dist']);
+
+
 	grunt.registerTask('prep-commonjs-test', 'run commonjs config build and browserify to prep for commonjs test',
 		['commonjs', 'browserify:commonjs']);
 
diff --git a/index.html b/index.html
index 414942a78..24998365f 100644
--- a/index.html
+++ b/index.html
@@ -2071,7 +2071,7 @@ <h5>Choose Folder Location</h5>
 							</div>
 
 							<div class="picker-body well">
-								<ul class="tree" id="myPickerTree1" role="tree">
+								<ul class="tree" id="myPickerTree1" role="tree" aria-activedescendant="" aria-label="My Tree">
 									<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
 										<div class="tree-branch-header">
 											<button type="button" class="glyphicon icon-caret glyphicon-play"><span class="sr-only">Open</span>
@@ -2113,10 +2113,10 @@ <h5>Choose Folder Location</h5>
 				<h2>Tree</h2>
 				<div class="thin-box">
 					<!-- Utilizes Handlebars templates (see index.js) -->
-					<h3>folders selectable (please note structure of treebranch)</h3>
+					<h3 id="myTreeLabel">folders selectable (please note structure of treebranch)</h3>
 					<div id="myTreeWrapper"></div>
 
-					<h3>only items selectable (please note structure of treebranch)</h3>
+					<h3 id="myTree2Label">only items selectable (please note structure of treebranch)</h3>
 					<div id="myTree2Wrapper"></div>
 
 				</div>
diff --git a/index.js b/index.js
index 784a56b67..a1465f6e5 100644
--- a/index.js
+++ b/index.js
@@ -999,7 +999,7 @@ define(function (require) {
 
 	var tree = require('hbs!fuelux_templates/tree');
 	var $myTreeWrapper = $('#myTreeWrapper');
-	$myTreeWrapper.html(tree({id: 'myTree', folderSelect: true}));
+	$myTreeWrapper.html(tree({id: 'myTree', labelledBy: 'myTreeLabel', folderSelect: true}));
 
 	var treeDataSource = function (parentData, callback) {
 		log('Opening branch data: ', parentData);
@@ -1099,7 +1099,7 @@ define(function (require) {
 	// initialize
 	function myTreeInit () {
 		var $myTree2Wrapper = $('#myTree2Wrapper');
-		$myTree2Wrapper.html(tree({id: 'myTree2'}));
+		$myTree2Wrapper.html(tree({id: 'myTree2', labelledBy: 'myTree2Label'}));
 
 		var callLimit = 200;
 		var callCount = 0;
diff --git a/js/tree.js b/js/tree.js
index 017311f6b..1bf62fb09 100644
--- a/js/tree.js
+++ b/js/tree.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Tree
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function tree ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
@@ -35,17 +37,19 @@
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.tree.defaults, options);
 
+		this.$element.attr('tabindex', '0');
+
 		if (this.options.itemSelect) {
-			this.$element.on('click.fu.tree', '.tree-item', $.proxy(function (ev) {
+			this.$element.on('click.fu.tree', '.tree-item', $.proxy(function callSelect (ev) {
 				this.selectItem(ev.currentTarget);
 			}, this));
 		}
 
-		this.$element.on('click.fu.tree', '.tree-branch-name', $.proxy(function (ev) {
+		this.$element.on('click.fu.tree', '.tree-branch-name', $.proxy(function callToggle (ev) {
 			this.toggleFolder(ev.currentTarget);
 		}, this));
 
-		this.$element.on('click.fu.tree', '.tree-overflow', $.proxy(function (ev){
+		this.$element.on('click.fu.tree', '.tree-overflow', $.proxy(function callPopulate (ev) {
 			this.populate($(ev.currentTarget));
 		}, this));
 
@@ -53,26 +57,37 @@
 		if (this.options.folderSelect) {
 			this.$element.addClass('tree-folder-select');
 			this.$element.off('click.fu.tree', '.tree-branch-name');
-			this.$element.on('click.fu.tree', '.icon-caret', $.proxy(function (ev) {
+			this.$element.on('click.fu.tree', '.icon-caret', $.proxy(function callToggle (ev) {
 				this.toggleFolder($(ev.currentTarget).parent());
 			}, this));
-			this.$element.on('click.fu.tree', '.tree-branch-name', $.proxy(function (ev) {
+			this.$element.on('click.fu.tree', '.tree-branch-name', $.proxy(function callSelect (ev) {
 				this.selectFolder($(ev.currentTarget));
 			}, this));
 		}
 
+		this.$element.on('focus', function setFocusOnTab () {
+			var $tree = $(this);
+			focusIn($tree, $tree);
+		});
+
+		this.$element.on('keydown', function processKeypress (e) {
+			return navigateTree($(this), e);
+		});
+
 		this.render();
 	};
 
 	Tree.prototype = {
 		constructor: Tree,
 
-		deselectAll: function deselectAll(nodes) {
+		deselectAll: function deselectAll(n) {
 			// clear all child tree nodes and style as deselected
-			nodes = nodes || this.$element;
+			var nodes = n || this.$element;
 			var $selectedElements = $(nodes).find('.tree-selected');
-			$selectedElements.each(function (index, element) {
-				styleNodeDeselected( $(element), $(element).find( '.glyphicon' ) );
+			$selectedElements.each(function callStyleNodeDeselected (index, element) {
+				var $element = $(element);
+				ariaDeselect($element);
+				styleNodeDeselected( $element, $element.find( '.glyphicon' ) );
 			});
 			return $selectedElements;
 		},
@@ -80,7 +95,7 @@
 		destroy: function destroy() {
 			// any external bindings [none]
 			// empty elements to return to original markup
-			this.$element.find("li:not([data-template])").remove();
+			this.$element.find('li:not([data-template])').remove();
 
 			this.$element.remove();
 			// returns string of markup
@@ -91,7 +106,7 @@
 			this.populate(this.$element);
 		},
 
-		populate: function populate($el, isBackgroundProcess) {
+		populate: function populate($el, ibp) {
 			var self = this;
 
 			// populate was initiated based on clicking overflow link
@@ -100,25 +115,25 @@
 			var $parent = ($el.hasClass('tree')) ? $el : $el.parent();
 			var atRoot = $parent.hasClass('tree');
 
-			if(isOverflow && !atRoot){
+			if (isOverflow && !atRoot) {
 				$parent = $parent.parent();
 			}
 
 			var treeData = $parent.data();
 			// expose overflow data to datasource so it can be responded to appropriately.
-			if(isOverflow){
+			if (isOverflow) {
 				treeData.overflow = $el.data();
 			}
 
-			isBackgroundProcess = isBackgroundProcess || false;	// no user affordance needed (ex.- "loading")
+			var isBackgroundProcess = ibp || false;	// no user affordance needed (ex.- "loading")
 
-			if(isOverflow){
-				if(atRoot){
+			if (isOverflow) {
+				if (atRoot) {
 					// the loader at the root level needs to continually replace the overflow trigger
 					// otherwise, when loader is shown below, it will be the loader for the last folder
 					// in the tree, instead of the loader at the root level.
 					$el.replaceWith($parent.find('> .tree-loader').remove());
-				}else{
+				} else {
 					$el.remove();
 				}
 			}
@@ -130,24 +145,25 @@
 			}
 
 
-			this.options.dataSource(treeData ? treeData : {}, function (items) {
-				$.each(items.data, function (index, value) {
-					var $entity;
-
-					if (value.type === 'folder') {
-						$entity = self.$element.find('[data-template=treebranch]:eq(0)').clone().removeClass('hide hidden').removeData('template').removeAttr('data-template'); // jQuery deprecated hide in 3.0. Use hidden instead. Leaving hide here to support previous markup
-						$entity.data(value);
-						$entity.find('.tree-branch-name > .tree-label').html(value.text || value.name);
-					} else if (value.type === 'item') {
-						$entity = self.$element.find('[data-template=treeitem]:eq(0)').clone().removeClass('hide hidden').removeData('template').removeAttr('data-template'); // jQuery deprecated hide in 3.0. Use hidden instead. Leaving hide here to support previous markup
-						$entity.find('.tree-item-name > .tree-label').html(value.text || value.name);
-						$entity.data(value);
-					} else if (value.type === 'overflow') {
-						$entity = self.$element.find('[data-template=treeoverflow]:eq(0)').clone().removeClass('hide hidden').removeData('template').removeAttr('data-template'); // jQuery deprecated hide in 3.0. Use hidden instead. Leaving hide here to support previous markup
-						$entity.find('.tree-overflow-name > .tree-label').html(value.text || value.name);
-						$entity.data(value);
+			this.options.dataSource(treeData ? treeData : {}, function populateNodes (items) {
+				$.each(items.data, function buildNode (i, treeNode) {
+					var nodeType = treeNode.type;
+
+					// 'item' and 'overflow' remain consistent, but 'folder' maps to 'branch'
+					if (treeNode.type === 'folder') {
+						nodeType = 'branch';
 					}
 
+					var $entity = self.$element
+						.find('[data-template=tree' + nodeType + ']:eq(0)')
+						.clone()
+						.removeClass('hide hidden')// jQuery deprecated hide in 3.0. Use hidden instead. Leaving hide here to support previous markup
+						.removeData('template')
+						.removeAttr('data-template');
+					$entity.find('.tree-' + nodeType + '-name > .tree-label').html(treeNode.text || treeNode.name);
+					$entity.data(treeNode);
+
+
 					// Decorate $entity with data or other attributes making the
 					// element easily accessible with libraries like jQuery.
 					//
@@ -168,37 +184,38 @@
 					// the "name" attribute is also supported but is deprecated for "text".
 
 					// add attributes to tree-branch or tree-item
-					var attr = value.attr || value.dataAttributes || [];
-					$.each(attr, function (key, value) {
-						switch (key) {
-							case 'cssClass':
-							case 'class':
-							case 'className':
-								$entity.addClass(value);
-								break;
-
-							// allow custom icons
-							case 'data-icon':
-								$entity.find('.icon-item').removeClass().addClass('icon-item ' + value);
-								$entity.attr(key, value);
-								break;
-
-							// ARIA support
-							case 'id':
-								$entity.attr(key, value);
-								$entity.attr('aria-labelledby', value + '-label');
-								$entity.find('.tree-branch-name > .tree-label').attr('id', value + '-label');
-								break;
-
-							// style, data-*
-							default:
-								$entity.attr(key, value);
-								break;
+					var attrs = treeNode.attr || treeNode.dataAttributes || [];
+					$.each(attrs, function setAttribute (attr, setTo) {
+						switch (attr) {
+						case 'cssClass':
+						case 'class':
+						case 'className':
+							$entity.addClass(setTo);
+							break;
+
+						// allow custom icons
+						case 'data-icon':
+							$entity.find('.icon-item').removeClass().addClass('icon-item ' + setTo);
+							$entity.attr(attr, setTo);
+							break;
+
+						// ARIA support
+						case 'id':
+							$entity.attr(attr, setTo);
+							$entity.attr('aria-labelledby', setTo + '-label');
+							$entity.find('.tree-branch-name > .tree-label').attr('id', setTo + '-label');
+							break;
+
+						// style, data-*
+						default:
+							$entity.attr(attr, setTo);
+							break;
 						}
 					});
 
 					// add child node
 					if (atRoot) {
+						// For accessibility reasons, the root element is the only tab-able element (see https://github.com/ExactTarget/fuelux/issues/1964)
 						$parent.append($entity);
 					} else {
 						$parent.find('.tree-branch-children:eq(0)').append($entity);
@@ -209,6 +226,9 @@
 
 				// return newly populated folder
 				self.$element.trigger('loaded.fu.tree', $parent);
+				// loaded.fu.tree was getting swallowed up somehow and was not triggering my listener when writing
+				// accessibility unit tests. Added populated.fu.tree so that I could listen for it instead.
+				self.$element.trigger('populated.fu.tree', $parent);
 			});
 		},
 
@@ -225,20 +245,22 @@
 				// make the clicked.$element the container branch
 				clicked.$element = clicked.$element.closest('.tree-branch');
 				clicked.$icon = clicked.$element.find('.icon-folder');
-			}
-			else {
+			} else {
 				clicked.$icon = clicked.$element.find('.icon-item');
 			}
 			clicked.elementData = clicked.$element.data();
 
+			ariaSelect(clicked.$element);
+
 			// the below functions pass objects by copy/reference and use modified object in this function
 			if ( this.options.multiSelect ) {
-				multiSelectSyncNodes(this, clicked, selected);
-			}
-			else {
-				singleSelectSyncNodes(this, clicked, selected);
+				selected = multiSelectSyncNodes(this, clicked, selected);
+			} else {
+				selected = singleSelectSyncNodes(this, clicked, selected);
 			}
 
+			setFocus(this.$element, clicked.$element);
+
 			// all done with the DOM, now fire events
 			this.$element.trigger(selected.eventType + '.fu.tree', {
 				target: clicked.elementData,
@@ -252,14 +274,14 @@
 			});
 		},
 
-		discloseFolder: function discloseFolder(el) {
-			var $el = $(el);
+		discloseFolder: function discloseFolder(folder) {
+			var $folder = $(folder);
 
-			var $branch = $el.closest('.tree-branch');
+			var $branch = $folder.closest('.tree-branch');
 			var $treeFolderContent = $branch.find('.tree-branch-children');
 			var $treeFolderContentFirstChild = $treeFolderContent.eq(0);
 
-			//take care of the styles
+			// take care of the styles
 			$branch.addClass('tree-open');
 			$branch.attr('aria-expanded', 'true');
 			$treeFolderContentFirstChild.removeClass('hide hidden'); // jQuery deprecated hide in 3.0. Use hidden instead. Leaving hide here to support previous markup
@@ -267,12 +289,18 @@
 				.removeClass('glyphicon-folder-close')
 				.addClass('glyphicon-folder-open');
 
-			//add the children to the folder
+			var $tree = this.$element;
+			var disclosedCompleted = function disclosedCompleted () {
+				$tree.trigger('disclosedFolder.fu.tree', $branch.data());
+			};
+
+			// add the children to the folder
 			if (!$treeFolderContent.children().length) {
+				$tree.one('populated.fu.tree', disclosedCompleted);
 				this.populate($treeFolderContent);
+			} else {
+				disclosedCompleted();
 			}
-
-			this.$element.trigger('disclosedFolder.fu.tree', $branch.data());
 		},
 
 		closeFolder: function closeFolder(el) {
@@ -281,7 +309,7 @@
 			var $treeFolderContent = $branch.find('.tree-branch-children');
 			var $treeFolderContentFirstChild = $treeFolderContent.eq(0);
 
-			//take care of the styles
+			// take care of the styles
 			$branch.removeClass('tree-open');
 			$branch.attr('aria-expanded', 'false');
 			$treeFolderContentFirstChild.addClass('hidden');
@@ -321,12 +349,12 @@
 
 		selectedItems: function selectedItems() {
 			var $sel = this.$element.find('.tree-selected');
-			var data = [];
+			var selected = [];
 
-			$.each($sel, function (index, value) {
-				data.push($(value).data());
+			$.each($sel, function buildSelectedArray (i, value) {
+				selected.push($(value).data());
 			});
-			return data;
+			return selected;
 		},
 
 		// collapses open folders
@@ -347,15 +375,15 @@
 				}
 			};
 
-			//trigger callback when all folders have reported closed
+			// trigger callback when all folders have reported closed
 			self.$element.on('closed.fu.tree', closedReported);
 
-			self.$element.find(".tree-branch.tree-open:not('.hidden, .hide')").each(function () {
+			self.$element.find(".tree-branch.tree-open:not('.hidden, .hide')").each(function closeFolder () {
 				self.closeFolder(this);
 			});
 		},
 
-		//disclose visible will only disclose visible tree folders
+		// disclose visible will only disclose visible tree folders
 		discloseVisible: function discloseVisible() {
 			var self = this;
 
@@ -378,7 +406,7 @@
 				}
 			};
 
-			//trigger callback when all folders have reported opened
+			// trigger callback when all folders have reported opened
 			self.$element.on('loaded.fu.tree', openReported);
 
 			// open all visible folders
@@ -387,7 +415,7 @@
 			});
 		},
 
-		/**
+		/*
 		* Disclose all will keep listening for `loaded.fu.tree` and if `$(tree-el).data('ignore-disclosures-limit')`
 		* is `true` (defaults to `true`) it will attempt to disclose any new closed folders than were
 		* loaded in during the last disclosure.
@@ -395,7 +423,7 @@
 		discloseAll: function discloseAll() {
 			var self = this;
 
-			//first time
+			// first time
 			if (typeof self.$element.data('disclosures') === 'undefined') {
 				self.$element.data('disclosures', 0);
 			}
@@ -423,7 +451,6 @@
 					if (!self.$element.data('ignore-disclosures-limit')) {
 						return;
 					}
-
 				}
 
 				self.$element.data('disclosures', self.$element.data('disclosures') + 1);
@@ -437,7 +464,7 @@
 				* and then when the trigger happens, this will fire N times, where N equals the number
 				* of recursive `discloseAll` executions (instead of just one)
 				*/
-				self.$element.one('disclosedVisible.fu.tree', function () {
+				self.$element.one('disclosedVisible.fu.tree', function callDiscloseAll () {
 					self.discloseAll();
 				});
 
@@ -454,14 +481,13 @@
 					disclosures: self.$element.data('disclosures')
 				});
 
-				//if `cacheItems` is false, and they call closeAll, the data is trashed and therefore
-				//disclosures needs to accurately reflect that
+				// if `cacheItems` is false, and they call closeAll, the data is trashed and therefore
+				// disclosures needs to accurately reflect that
 				if (!self.options.cacheItems) {
-					self.$element.one('closeAll.fu.tree', function () {
+					self.$element.one('closeAll.fu.tree', function updateDisclosuresData () {
 						self.$element.data('disclosures', 0);
 					});
 				}
-
 			}
 		},
 
@@ -475,8 +501,7 @@
 
 			if ($treeFolder.hasClass('tree-open')) {
 				this.populate($treeFolderChildren, false);
-			}
-			else {
+			} else {
 				this.populate($treeFolderChildren, true);
 			}
 
@@ -487,15 +512,220 @@
 
 	// ALIASES
 
-	//alias for collapse for consistency. "Collapse" is an ambiguous term (collapse what? All? One specific branch?)
+	// alias for collapse for consistency. "Collapse" is an ambiguous term (collapse what? All? One specific branch?)
 	Tree.prototype.closeAll = Tree.prototype.collapse;
-	//alias for backwards compatibility because there's no reason not to.
+	// alias for backwards compatibility because there's no reason not to.
 	Tree.prototype.openFolder = Tree.prototype.discloseFolder;
-	//For library consistency
+	// For library consistency
 	Tree.prototype.getValue = Tree.prototype.selectedItems;
 
 	// PRIVATE FUNCTIONS
 
+	var fixFocusability = function fixFocusability ($tree, $branch) {
+		/*
+		When tree initializes on page, the `<ul>` element should have tabindex=0 and all sub-elements should have
+		tabindex=-1. When focus leaves the tree, whatever the last focused on element was will keep the tabindex=0. The
+		tree itself will have a tabindex=-1. The reason for this is that if you are inside of the tree and press
+		shift+tab, it will try and focus on the tree you are already in, which will cause focus to shift immediately
+		back to the element you are already focused on. That will make it seem like the event is getting "Swallowed up"
+		by an aggressive event listener trap.
+
+		For this reason, only one element in the entire tree, including the tree itself, should ever have tabindex=0.
+		If somewhere down the line problems are being caused by this, the only further potential improvement I can
+		envision at this time is listening for the tree to lose focus and reseting the tabindexes of all children to -1
+		and setting the tabindex of the tree itself back to 0. This seems overly complicated with no benefit that I can
+		imagine at this time, so instead I am leaving the last focused element with the tabindex of 0, even upon blur of
+		the tree.
+
+		One benefit to leaving the last focused element in a tree with a tabindex=0 is that if you accidentally tab out
+		of the tree and then want to tab back in, you will be placed exactly where you left off instead of at the
+		beginning of the tree.
+		*/
+		$tree.attr('tabindex', -1);
+		$tree.find('li').attr('tabindex', -1);
+		if ($branch && $branch.length > 0) {
+			$branch.attr('tabindex', 0); // if tabindex is not set to 0 (or greater), node is not able to receive focus
+		}
+	};
+
+	// focuses into (onto one of the children of) the provided branch
+	var focusIn = function focusIn ($tree, $branch) {
+		var $focusCandidate = $branch.find('.tree-selected:first');
+
+		// if no node is selected, set focus to first visible node
+		if ($focusCandidate.length <= 0) {
+			$focusCandidate = $branch.find('li:not(".hidden"):first');
+		}
+
+		setFocus($tree, $focusCandidate);
+	};
+
+	// focuses on provided branch
+	var setFocus = function setFocus ($tree, $branch) {
+		fixFocusability($tree, $branch);
+
+		$tree.attr('aria-activedescendant', $branch.attr('id'));
+
+		$branch.focus();
+
+		$tree.trigger('setFocus.fu.tree', $branch);
+	};
+
+	var navigateTree = function navigateTree ($tree, e) {
+		if (e.isDefaultPrevented() || e.isPropagationStopped()) {
+			return false;
+		}
+
+		var targetNode = e.originalEvent.target;
+		var $targetNode = $(targetNode);
+		var isOpen = $targetNode.hasClass('tree-open');
+		var handled = false;
+		// because es5 lacks promises and fuelux has no polyfil (and I'm not adding one just for this change)
+		// I am faking up promises here through callbacks and listeners. Done will be fired immediately at the end of
+		// the navigateTree method if there is no (fake) promise, but will be fired by an event listener that will
+		// be triggered by another function if necessary. This way when done runs, and fires keyboardNavigated.fu.tree
+		// anything listening for that event can be sure that everything tied to that event is actually completed.
+		var noPromise = true;
+		var done = function done () {
+			$tree.trigger('keyboardNavigated.fu.tree', e, $targetNode);
+		};
+
+		switch (e.which) {
+		case 13: // enter
+		case 32: // space
+			// activates a node, i.e., performs its default action.
+			// For parent nodes, one possible default action is to open or close the node.
+			// In single-select trees where selection does not follow focus, the default action is typically to select the focused node.
+			var foldersSelectable = $tree.hasClass('tree-folder-select');
+			var isFolder = $targetNode.hasClass('tree-branch');
+			var isItem = $targetNode.hasClass('tree-item');
+			// var isOverflow = $targetNode.hasClass('tree-overflow');
+
+			noPromise = false;
+			if (isFolder) {
+				if (foldersSelectable) {
+					$tree.one('selected.fu.tree deselected.fu.tree', done);
+					$tree.tree('selectFolder', $targetNode.find('.tree-branch-header')[0]);
+				} else {
+					$tree.one('populated.fu.tree closed.fu.tree', done);
+					$tree.tree('toggleFolder', $targetNode.find('.tree-branch-header')[0]);
+				}
+			} else if (isItem) {
+				$tree.one('selected.fu.tree', done);
+				$tree.tree('selectItem', $targetNode);
+			} else {
+				// should be isOverflow... Try and click on it either way.
+				$prev = $($targetNode.prevAll().not('.hidden')[0]);
+				$targetNode.click();
+
+				$tree.one('loaded.fu.tree', function selectFirstNewlyLoadedNode () {
+					$next = $($prev.nextAll().not('.hidden')[0]);
+
+					setFocus($tree, $next);
+					done();
+				});
+			}
+
+			handled = true;
+			break;
+		case 35: // end
+			// Set focus to the last node in the tree that is focusable without opening a node.
+			setFocus($tree, $tree.find('li:not(".hidden"):last'));
+
+			handled = true;
+			break;
+		case 36: // home
+			// set focus to the first node in the tree without opening or closing a node.
+			setFocus($tree, $tree.find('li:not(".hidden"):first'));
+
+			handled = true;
+			break;
+		case 37: // left
+			if (isOpen) {
+				noPromise = false;
+				$tree.one('closed.fu.tree', done);
+				$tree.tree('closeFolder', targetNode);
+			} else {
+				setFocus($tree, $($targetNode.parents('li')[0]));
+			}
+
+			handled = true;
+			break;
+
+		case 38: // up
+			// move focus to previous sibling
+			var $prev = [];
+			// move to previous li not hidden
+			$prev = $($targetNode.prevAll().not('.hidden')[0]);
+
+			// if the previous li is open, move to its last child so selection appears to move to the next "thing" up
+			if ($prev.hasClass('tree-open')) {
+				$prev = $($prev.find('li:not(".hidden"):last')[0]);
+			}
+
+			// if nothing has been selected, we are presumably at the top of an open li, select the immediate parent
+			if ($prev.length < 1) {
+				$prev = $($targetNode.parents('li')[0]);
+			}
+			setFocus($tree, $prev);
+
+			handled = true;
+			break;
+
+		case 39: // right
+			if (isOpen) {
+				focusIn($tree, $targetNode);
+			} else {
+				noPromise = false;
+				$tree.one('disclosed.fu.tree', done);
+				$tree.tree('discloseFolder', targetNode);
+			}
+
+			handled = true;
+			break;
+
+		case 40: // down
+			// move focus to next selectable tree node
+			var $next = [];
+			if (isOpen) {
+				$next = $($targetNode.find('li:not(".hidden"):first')[0]);
+			} else {
+				$next = $($targetNode.nextAll().not('.hidden')[0]);
+			}
+
+			if ($next.length < 1) {
+				$next = $($($targetNode.parents('li')[0]).nextAll().not('.hidden')[0]);
+			}
+			setFocus($tree, $next);
+
+			handled = true;
+			break;
+
+		default:
+			// console.log(e.which);
+			return true; // exit this handler for other keys
+		}
+
+		// if we didn't handle the event, allow propagation to continue so something else might.
+		if (handled) {
+			e.preventDefault();
+			e.stopPropagation();
+			if (noPromise) {
+				done();
+			}
+		}
+
+		return true;
+	};
+
+	var ariaSelect = function ariaSelect ($element) {
+		$element.attr('aria-selected', true);
+	};
+
+	var ariaDeselect = function ariaDeselect ($element) {
+		$element.attr('aria-selected', false);
+	};
+
 	function styleNodeSelected ($element, $icon) {
 		$element.addClass('tree-selected');
 		if ( $element.data('type') === 'item' && $icon.hasClass('fueluxicon-bullet') ) {
@@ -512,51 +742,54 @@
 
 	function multiSelectSyncNodes (self, clicked, selected) {
 		// search for currently selected and add to selected data list if needed
-		$.each(selected.$elements, function (index, element) {
+		$.each(selected.$elements, function findCurrentlySelected (index, element) {
 			var $element = $(element);
+
 			if ($element[0] !== clicked.$element[0]) {
 				selected.dataForEvent.push( $($element).data() );
 			}
 		});
 
 		if (clicked.$element.hasClass('tree-selected')) {
-			styleNodeDeselected (clicked.$element, clicked.$icon);
+			styleNodeDeselected(clicked.$element, clicked.$icon);
 			// set event data
 			selected.eventType = 'deselected';
-		}
-		else {
+		} else {
 			styleNodeSelected(clicked.$element, clicked.$icon);
 			// set event data
 			selected.eventType = 'selected';
 			selected.dataForEvent.push(clicked.elementData);
 		}
+
+		return selected;
 	}
 
 	function singleSelectSyncNodes(self, clicked, selected) {
 		// element is not currently selected
 		if (selected.$elements[0] !== clicked.$element[0]) {
-			var clearedElements = self.deselectAll(self.$element);
+			self.deselectAll(self.$element);
 			styleNodeSelected(clicked.$element, clicked.$icon);
 			// set event data
 			selected.eventType = 'selected';
 			selected.dataForEvent = [clicked.elementData];
-		}
-		else {
+		} else {
 			styleNodeDeselected(clicked.$element, clicked.$icon);
 			// set event data
 			selected.eventType = 'deselected';
 			selected.dataForEvent = [];
 		}
+
+		return selected;
 	}
 
 
 	// TREE PLUGIN DEFINITION
 
-	$.fn.tree = function tree(option) {
+	$.fn.tree = function fntree (option) {
 		var args = Array.prototype.slice.call(arguments, 1);
 		var methodReturn;
 
-		var $set = this.each(function () {
+		var $set = this.each(function eachThis () {
 			var $this = $(this);
 			var data = $this.data('fu.tree');
 			var options = typeof option === 'object' && option;
@@ -574,7 +807,7 @@
 	};
 
 	$.fn.tree.defaults = {
-		dataSource: function dataSource(options, callback) {},
+		dataSource: function dataSource() {},
 		multiSelect: false,
 		cacheItems: true,
 		folderSelect: true,
@@ -604,7 +837,7 @@
 
 	$.fn.tree.Constructor = Tree;
 
-	$.fn.tree.noConflict = function () {
+	$.fn.tree.noConflict = function noConflict () {
 		$.fn.tree = old;
 		return this;
 	};
diff --git a/less/tree.less b/less/tree.less
index f026ed44e..4434c7d77 100644
--- a/less/tree.less
+++ b/less/tree.less
@@ -14,6 +14,11 @@
 			outline: none;
 		}
 
+		:focus > .tree-branch-header .tree-label, :focus > button .tree-label {
+			outline: 0;
+			text-decoration: underline;
+		}
+
 		button:focus {
 			color: @tree-hover-text;
 		}
diff --git a/reference/markup/tree-folders-selectable.html b/reference/markup/tree-folders-selectable.html
index 4e3bace22..0da46e34e 100644
--- a/reference/markup/tree-folders-selectable.html
+++ b/reference/markup/tree-folders-selectable.html
@@ -2,11 +2,11 @@
 <html lang="en">
 <head><title>Sample Markup</title></head>
 <body>
-<ul class="tree tree-folder-select" id="myTree" role="tree">
-	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+<ul class="tree tree-folder-select" id="myTree" role="tree" aria-activedescendant="" aria-multiselectable=false>
+	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 		<div class="tree-branch-header">
-			<button type="button" class="glyphicon icon-caret glyphicon-play"><span class="sr-only">Open</span></button>
-			<button type="button" class="tree-branch-name">
+			<button type="button" class="glyphicon icon-caret glyphicon-play" tabindex="-1"><span class="sr-only">Open</span></button>
+			<button type="button" class="tree-branch-name" tabindex="-1">
 				<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 				<span class="tree-label"></span>
 			</button>
@@ -14,8 +14,8 @@
 		<ul class="tree-branch-children" role="group"></ul>
 		<div class="tree-loader"><span role="alert">Loading...</span></div>
 	</li>
-	<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-		<button type="button" class="tree-item-name">
+	<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+		<button type="button" class="tree-item-name" tabindex="-1">
 			<span class="glyphicon icon-item fueluxicon-bullet"></span>
 			<span class="tree-label"></span>
 		</button>
diff --git a/reference/markup/tree.html b/reference/markup/tree.html
index 1e9a90582..b433f2089 100644
--- a/reference/markup/tree.html
+++ b/reference/markup/tree.html
@@ -2,10 +2,10 @@
 <html lang="en">
 <head><title>Sample Markup</title></head>
 <body>
-<ul class="tree" id="myTree" role="tree">
-	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+<ul class="tree" id="myTree" role="tree" aria-activedescendant="" aria-multiselectable=false>
+	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 		<div class="tree-branch-header">
-			<button type="button" class="tree-branch-name">
+			<button type="button" class="tree-branch-name" tabindex="-1">
 				<span class="glyphicon icon-caret glyphicon-play"></span>
 				<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 				<span class="tree-label"></span>
@@ -14,14 +14,14 @@
 		<ul class="tree-branch-children" role="group"></ul>
 		<div class="tree-loader"><span role="alert">Loading...</span></div>
 	</li>
-	<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-		<button type="button" class="tree-item-name">
+	<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+		<button type="button" class="tree-item-name" tabindex="-1">
 			<span class="glyphicon icon-item fueluxicon-bullet"></span>
 			<span class="tree-label"></span>
 		</button>
 	</li>
 	<li class="tree-overflow hidden" data-template="treeoverflow" role="treeitem">
-		<button type="button" class="tree-overflow-name">
+		<button type="button" class="tree-overflow-name" tabindex="-1">
 			<span class="glyphicon"></span>
 			<span class="tree-label"></span>
 		</button>
diff --git a/templates/handlebars/fuelux/tree.hbs b/templates/handlebars/fuelux/tree.hbs
index 47b3da241..750d93ae8 100644
--- a/templates/handlebars/fuelux/tree.hbs
+++ b/templates/handlebars/fuelux/tree.hbs
@@ -1,8 +1,14 @@
-<ul class="tree {{#if folderSelect}}tree-folder-select{{/if}}" id="{{#if id}}{{id}}{{else}}myTree{{/if}}" role="tree">
-	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+<ul class="tree {{#if folderSelect}}tree-folder-select{{/if}}"
+	id="{{#if id}}{{id}}{{else}}myTree{{/if}}"
+	role="tree"
+	aria-activedescendant=""
+	{{#if multiSelect}} aria-multiselectable="true"{{/if}}
+	{{#unless labelledBy}}aria-label="{{#if label}}{{label}}{{/if}}"{{/unless}}
+	{{#if labelledBy}}aria-labelledby="{{labelledBy}}"{{/if}}>
+	<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 		<div class="tree-branch-header">
-			{{#if folderSelect}}<button type="button" class="glyphicon icon-caret glyphicon-play"><span class="sr-only">Open</span></button>{{/if}}
-			<button type="button" class="tree-branch-name">
+			{{#if folderSelect}}<button type="button" class="glyphicon icon-caret glyphicon-play" tabindex="-1"><span class="sr-only">Open</span></button>{{/if}}
+			<button type="button" class="tree-branch-name" tabindex="-1">
 				{{#unless folderSelect}}<span class="glyphicon icon-caret glyphicon-play"></span>{{/unless}}
 				<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 				<span class="tree-label"></span>
@@ -12,14 +18,14 @@
 		<!-- this loader shows on nested folders and when overflow is triggered -->
 		{{#if loaderHTML }}{{loaderHTML}}{{else}}<div class="tree-loader hidden"><span role="alert">Loading...</span></div>{{/if}}
 	</li>
-	<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-		<button type="button" class="tree-item-name">
+	<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+		<button type="button" class="tree-item-name" tabindex="-1">
 			<span class="glyphicon icon-item fueluxicon-bullet"></span>
 			<span class="tree-label"></span>
 		</button>
 	</li>
 	<li class="tree-overflow hidden" data-template="treeoverflow" role="treeitem">
-		<button type="button" class="tree-overflow-name">
+		<button type="button" class="tree-overflow-name" tabindex="-1">
 			<span class="glyphicon"></span>
 			<span class="tree-label"></span>
 		</button>
diff --git a/test/markup/tree-markup.html b/test/markup/tree-markup.html
index 06439e193..ce3ead9a3 100644
--- a/test/markup/tree-markup.html
+++ b/test/markup/tree-markup.html
@@ -6,11 +6,10 @@
 	<label class="control-label">Items selectable only</label>
 	<div class="form-group">
 
-		<ul id="MyTree" class="tree" role="tree">
-			<!-- branch/folder template -->
-			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+		<ul class="tree" id="MyTree" role="tree" aria-activedescendant="" aria-label="My Tree" aria-multiselectable=false>
+			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
-					<button type="button" class="tree-branch-name">
+					<button type="button" class="tree-branch-name" tabindex="-1">
 						<span class="glyphicon icon-caret glyphicon-play"></span>
 						<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 						<span class="tree-label">Example Folder</span>
@@ -19,15 +18,14 @@
 				<ul class="tree-branch-children" role="group"></ul>
 				<div class="tree-loader"><span role="alert">Loading...</span></div>
 			</li>
-			<!-- item template -->
-			<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-				<button type="button" class="tree-item-name">
+			<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+				<button type="button" class="tree-item-name" tabindex="-1">
 					<span class="glyphicon icon-item fueluxicon-bullet"></span>
 					<span class="tree-label">Example Item</span>
 				</button>
 			</li>
 			<li class="tree-overflow hidden" data-template="treeoverflow" role="treeitem">
-				<button type="button" class="tree-overflow-name">
+				<button type="button" class="tree-overflow-name" tabindex="-1">
 					<span class="glyphicon"></span>
 					<span class="tree-label"></span>
 				</button>
@@ -35,11 +33,10 @@
 			<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
 		</ul>
 
-		<ul id="MyTree2" class="tree" role="tree">
-			<!-- branch/folder template -->
-			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+		<ul class="tree" id="MyTree2" role="tree" aria-activedescendant="" aria-label="My Tree 2" aria-multiselectable=false>
+			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
-					<button type="button" class="tree-branch-name">
+					<button type="button" class="tree-branch-name" tabindex="-1">
 						<span class="glyphicon icon-caret glyphicon-play"></span>
 						<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 						<span class="tree-label">Example Folder</span>
@@ -48,15 +45,14 @@
 				<ul class="tree-branch-children" role="group"></ul>
 				<div class="tree-loader"><span role="alert">Loading...</span></div>
 			</li>
-			<!-- item template -->
-			<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-				<button type="button" class="tree-item-name">
+			<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+				<button type="button" class="tree-item-name" tabindex="-1">
 					<span class="glyphicon icon-item fueluxicon-bullet"></span>
 					<span class="tree-label">Example Item</span>
 				</button>
 			</li>
 			<li class="tree-overflow hidden" data-template="treeoverflow" role="treeitem">
-				<button type="button" class="tree-overflow-name">
+				<button type="button" class="tree-overflow-name" tabindex="-1">
 					<span class="glyphicon"></span>
 					<span class="tree-label"></span>
 				</button>
@@ -71,28 +67,26 @@
 	<label class="control-label">Folders selectable</label>
 	<div class="form-group">
 
-		<ul id="MyTreeSelectableFolder" class="tree tree-folder-select" role="tree">
-			<!-- branch/folder template -->
-			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false">
+		<ul id="MyTreeSelectableFolder" class="tree tree-folder-select" role="tree" aria-activedescendant="" aria-label="My Tree Selectable" aria-multiselectable=false>
+			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
-					<button type="button" class="glyphicon icon-caret glyphicon-play"><span class="sr-only">Open</span></button>
-					<button type="button" class="tree-branch-name">
+					<button type="button" class="tree-branch-name" tabindex="-1">
+						<span class="glyphicon icon-caret glyphicon-play"></span>
 						<span class="glyphicon icon-folder glyphicon-folder-close"></span>
 						<span class="tree-label">Example Folder</span>
 					</button>
 				</div>
-				<ul class="tree-branch-children"></ul>
+				<ul class="tree-branch-children" role="group"></ul>
 				<div class="tree-loader"><span role="alert">Loading...</span></div>
 			</li>
-			<!-- item template -->
-			<li class="tree-item hidden" data-template="treeitem" role="treeitem">
-				<button type="button" class="tree-item-name">
+			<li class="tree-item hidden" data-template="treeitem" role="treeitem" aria-selected="false">
+				<button type="button" class="tree-item-name" tabindex="-1">
 					<span class="glyphicon icon-item fueluxicon-bullet"></span>
 					<span class="tree-label">Example Item</span>
 				</button>
 			</li>
 			<li class="tree-overflow hidden" data-template="treeoverflow" role="treeitem">
-				<button type="button" class="tree-overflow-name">
+				<button type="button" class="tree-overflow-name" tabindex="-1">
 					<span class="glyphicon"></span>
 					<span class="tree-label"></span>
 				</button>
diff --git a/test/tree-test.js b/test/tree-test.js
index 73f552ce7..240582219 100644
--- a/test/tree-test.js
+++ b/test/tree-test.js
@@ -1,452 +1,57 @@
-/*global QUnit:false, module:false, test:false, asyncTest:false, expect:false*/
-/*global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false*/
-/*global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false*/
-define( function ( require ) {
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
+define(function treeTest (require) {
 	var QUnit = require('qunit');
-	var $ = require( "jquery" );
-	var html = require( "text!test/markup/tree-markup.html!strip" );
-
-	$( "body" ).append( html );
-
-	require( "bootstrap" );
-	require( "fuelux/tree" );
-
-	QUnit.module( "Fuel UX Tree", {
-		beforeEach: function( assert ) {
-			var callLimit = 50;
-			var callCount = 0;
-
-			function guid () {
-				function s4 () {
-					return Math.floor( ( 1 + Math.random() ) * 0x10000 )
-						.toString( 16 )
-						.substring( 1 );
-				}
-				return s4() + s4() + "-" + s4() + "-" + s4() + "-" + s4() + "-" + s4() + s4() + s4();
-			}
-
-			this.dataSource = function( options, callback ) {
-				if ( callCount >= callLimit ) {
-					callback( {
-						data: [
-							{
-								"name": "Convex and Concave",
-								"type": "item",
-								"attr": {
-									"id": "item4"
-								}
-							}
-						]
-					}, 400 );
-					return;
-				}
-
-				callCount++;
-
-				callback( {
-					data: [
-						{
-							name: "Ascending and Descending",
-							type: "folder",
-							attr: {
-								id: "folder" + guid()
-							}
-						},
-						{
-							name: "Sky and Water I (with custom icon)",
-							type: "item",
-							attr: {
-								id: "folder" + guid(),
-								"data-icon": "glyphicon glyphicon-file"
-							}
-						},
-						{
-							name: "Drawing Hands",
-							type: "folder",
-							attr: {
-								id: "folder" + guid(),
-								"data-children": false
-							}
-						},
-						{
-							name: "Waterfall",
-							type: "item",
-							attr: {
-								id: "item2"
-							}
-						},
-						{
-							name: "Belvedere",
-							type: "folder",
-							attr: {
-								id: "folder" + guid()
-							}
-						},
-						{
-							name: "Relativity (with custom icon)",
-							type: "item",
-							attr: {
-								id: "item3",
-								"data-icon": "glyphicon glyphicon-picture"
-							}
-						},
-						{
-							name: "House of Stairs",
-							type: "folder",
-							attr: {
-								id: "folder" + guid()
-							}
-						},
-						{
-							name: "Convex and Concave",
-							type: "item",
-							attr: {
-								id: "item4"
-							}
-						},
-						{
-							name: "Load More",
-							type: "overflow",
-							attr: {
-								id: "overflow1"
-							}
-						}
-					]
-				} );
-			};
-
-			this.textDataSource = function( options, callback ) {
-				callback( {
-					data: [
-						{
-							text: "node text",
-							type: "folder",
-							attr: {
-								id: "folder1"
-							}
-						}
-					]
-				} );
-			};
-
-		}
-	} );
-
-	var NUM_CHILDREN = 9;
-	var NUM_FOLDERS = 4;
-	var NUM_ITEMS = 4;
-	var NUM_OVERFLOWS = 1;
-
-	QUnit.test( "should be defined on jquery object", function( assert ) {
-		assert.ok( $().tree, "tree method is defined" );
-	} );
-
-	QUnit.test( "should return element", function( assert ) {
-		var $tree = $( html );
-		assert.ok( $tree.tree() === $tree, "tree should be initialized" );
-	} );
-
-	QUnit.test( "should have correct defaults", function correctDefaults( assert ) {
-		var $tree = $( html );
-
-		var defaults = $tree.tree.defaults;
-
-		assert.equal( defaults.multiSelect, false, "multiSelect defaults to false" );
-		assert.equal( defaults.cacheItems, true, "cacheItems defaults to true" );
-		assert.equal( defaults.folderSelect, true, "folderSelect defaults to true" );
-		assert.equal( defaults.itemSelect, true, "itemSelect defaults to true" );
-		assert.equal( defaults.disclosuresUpperLimit, 0, "disclosuresUpperLimit defaults to 0" );
-		assert.ok( defaults.dataSource, "dataSource exists by default" );
-	} );
-
-	QUnit.test( "should call dataSource correctly", function( assert ) {
-		var $tree = $( html );
-		$tree.tree( {
-			dataSource: function( options, callback ) {
-				assert.ok( 1 === 1, "dataSource function called prior to rendering" );
-				assert.equal( typeof options, "object", "dataSource provided options object" );
-				assert.equal( typeof callback, "function", "dataSource provided callback function" );
-				callback( {
-					data: []
-				} );
-			}
-		} );
-	} );
-
-	QUnit.test( "Tree should be populated by items on initialization", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		assert.equal( $tree.find( ".tree-branch:not([data-template])" ).length, NUM_FOLDERS, "Initial set of folders have been added" );
-		assert.equal( $tree.find( ".tree-item:not([data-template])" ).length, NUM_ITEMS, "Initial set of items have been added" );
-		assert.equal( $tree.find( ".tree-overflow:not([data-template])" ).length, NUM_OVERFLOWS, "Initial overflow has been added" );
-	} );
-
-	QUnit.test( "Folder should populate when opened", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-		var $selNode;
-
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		$selNode = $tree.find( ".tree-branch:eq(1)" );
-		$tree.tree( "discloseFolder", $selNode.find( ".tree-branch-name" ) );
-		assert.equal( $selNode.find( ".tree-branch-children > li" ).length, NUM_CHILDREN, "Folder has been populated with items/sub-folders" );
-
-		$tree = $( html ).find( "#MyTreeSelectableFolder" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			folderSelect: true
-		} );
-
-		$selNode = $tree.find( ".tree-branch:eq(1)" );
-		$tree.tree( "discloseFolder", $selNode.find( ".tree-branch-header" ) );
-		assert.equal( $selNode.find( ".tree-branch-children > li" ).length, NUM_CHILDREN, "Folder has been populated with sub-folders and items" );
-	} );
-
-	QUnit.test( "getValue alias should function", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		// MultiSelect: false is the default
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.deepEqual( $tree.tree( "selectedItems" ), $tree.tree( "getValue" ), "getValue aliases selectedItems" );
-	} );
-
-	QUnit.test( "Single item/folder selection works as designed", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		// MultiSelect: false is the default
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected value" );
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(2)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return new single selected value" );
-
-		$tree = $( html ).find( "#MyTreeSelectableFolder" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			folderSelect: true
-		} );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected item (none previously selected, 1st programatic selection)" );
-
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected folder (item previously selected, 2nd programatic selection)" );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(2)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected item (folder previously selected, 3rd programatic selection)" );
-
-		$tree.find( ".tree-item:eq(1)" ).click();
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected item (item previously selected, 1st click selection)" );
-
-		$tree.find( ".tree-branch-name:eq(1)" ).click();
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected folder (item previously selected, 2nd click selection)" );
-
-		$tree.find( ".tree-item:eq(2)" ).click();
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected item (folder previously selected, 3rd click selection)" );
-
-	} );
-
-	// Test("Overflow click works as designed", function () {
-	// 	var $tree = $(html).find('#MyTree');
-
-	// 	$tree.tree({
-	// 		dataSource: this.dataSource
-	// 	});
-
-	// 	Equal($tree.find('> li:not([data-template])').length, NUM_CHILDREN, 'Initial set of folders (' + NUM_CHILDREN + ' children) have been added');
-	// 	$tree.find('.tree-overflow:eq(0)').click();
-	// 	//Once overflow is clicked, all original contents is loaded again, and original overflow is actually REMOVED from tree contents.
-	// 	var NUM_AFTER_OVERFLOW_CLICK = (NUM_CHILDREN * 2) - 1;
-	// 	equal($tree.find('> li:not([data-template])').length, NUM_AFTER_OVERFLOW_CLICK, 'Overflow contents (now ' + NUM_AFTER_OVERFLOW_CLICK + ' children) have loaded');
-
-	// });
-
-	QUnit.test( "Multiple item/folder selection works as designed", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			multiSelect: true
-		} );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected value" );
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(2)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 2, "Return multiple selected values" );
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected value" );
-
-		$tree = $( html ).find( "#MyTreeSelectableFolder" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			multiSelect: true,
-			folderSelect: true
-		} );
-
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected value" );
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(2)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 2, "Return multiple selected values" );
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 1, "Return single selected value" );
-	} );
-
-	QUnit.test( "should not allow selecting items if disabled", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			itemSelect: false
-		} );
-
-		$tree.tree( "selectItem", $tree.find( ".tree-item:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 0, "Return no value" );
-	} );
-
-	QUnit.test( "should not allow selecting folders if disabled", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource,
-			folderSelect: false
-		} );
-
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" ).length, 0, "Return no value" );
-	} );
-
-	QUnit.test( "folders should open and close correctly", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		var $targetBranch = $( $tree.find( ".tree-branch" )[ 0 ] );
-
-		assert.equal( $targetBranch.hasClass( "tree-open" ), false, "Branch starts closed" );
-		$tree.tree( "discloseFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), true, "discloseFolder opens folder" );
-		$tree.tree( "discloseFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), true, "redundant discloseFolder calls leaves folder open" );
-		$tree.tree( "closeFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), false, "closeFolder closes folder" );
-		$tree.tree( "closeFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), false, "redundant closeFolder calls leaves folder closed" );
-		$tree.tree( "toggleFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), true, "toggleFolder on closed folder opens folder" );
-		$tree.tree( "toggleFolder", $targetBranch );
-		assert.equal( $targetBranch.hasClass( "tree-open" ), false, "toggleFolder on open folder closes folder" );
-	} );
-
-	QUnit.test( "should disclose visible folders", function( assert ) {
-        var ready = assert.async();
-        var $tree = $( "body" ).find( "#MyTree" );
-
-        $tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-        var toBeOpened = $tree.find( ".tree-branch:not('.tree-open, .hidden')" ).length;
-        assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, 0, "0 folders open" );
-
-        $tree.one( "disclosedVisible.fu.tree", function() {
-			assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, toBeOpened, toBeOpened + " folders open" );
-			ready();
-		} );
-
-        $tree.tree( "discloseVisible" );
-    } );
-
-	QUnit.test( "should disclose all folders up to limit, and then close them, then open them all", function( assert ) {
-        var ready = assert.async();
-        var $tree = $( "body" ).find( "#MyTree2" );
-
-        $tree.tree( {
-			dataSource: this.dataSource,
-			disclosuresUpperLimit: 2
-		} );
-
-        assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, 0, "0 folders open" );
-        $tree.one( "exceededDisclosuresLimit.fu.tree", function exceededDisclosuresLimit() {
-			assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, 20, "20 folders open" );
-
-			$tree.one( "closedAll.fu.tree", function closedAll() {
-				assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, 0, "0 folders open" );
-
-				$tree.data( "ignore-disclosures-limit", true );
-
-				$tree.one( "disclosedAll.fu.tree", function exceededDisclosuresLimit() {
-					assert.equal( $tree.find( ".tree-branch.tree-open:not('.hidden')" ).length, 200, "200 folders open" );
-					ready();
-				} );
-
-				$tree.tree( "discloseAll" );
-			} );
-
-			$tree.tree( "closeAll" );
-		} );
-
-        $tree.tree( "discloseAll" );
-    } );
-
-	QUnit.test( "should refresh an already opened/cached folder with new nodes", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-		var $folderToRefresh;
-		var initialLoadedFolderId, refreshedLoadedFolderId;
-		var selector = ".tree-branch-children > li:eq(0)";
-
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-		$folderToRefresh = $tree.find( ".tree-branch:eq(1)" );
-
-		// Open folder
-		$tree.tree( "discloseFolder", $folderToRefresh.find( ".tree-branch-name" ) );
-		assert.equal( $folderToRefresh.find( ".tree-branch-children > li" ).length, NUM_CHILDREN, "Folder has been populated with items/sub-folders" );
-		initialLoadedFolderId = $folderToRefresh.find( selector ).attr( "id" );
-
-		// Refresh and see if it's the same ID
-		$tree.tree( "refreshFolder", $folderToRefresh );
-		refreshedLoadedFolderId = $folderToRefresh.find( ".tree-branch-children > li:eq(0)" ).attr( "id" );
-		assert.notEqual( refreshedLoadedFolderId, initialLoadedFolderId, "Folder has been refreshed and populated with different items/sub-folders" );
-	} );
-
-	QUnit.test( "should destroy control", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.dataSource
-		} );
-
-		assert.equal( typeof ( $tree.tree( "destroy" ) ), "string", "returns string (markup)" );
-		assert.equal( $tree.parent().length, false, "control has been removed from DOM" );
-	} );
-
-	QUnit.test( "Tree should accept TEXT as the NAME property in the datasource", function( assert ) {
-		var $tree = $( html ).find( "#MyTree" );
-
-		$tree.tree( {
-			dataSource: this.textDataSource
-		} );
-
-		$tree.tree( "selectFolder", $tree.find( ".tree-branch-name:eq(1)" ) );
-		assert.equal( $tree.tree( "selectedItems" )[ 0 ].text, "node text", "Param TEXT used in the datasource" );
-	} );
-} );
+	var $ = require('jquery');
+
+	require('bootstrap');
+	require('fuelux/tree');
+
+	QUnit.module('Fuel UX Tree', {
+		beforeEach: require('./tree-tests/helpers').setup
+	}, function runTreeTests () {
+		QUnit.test('should be defined on jquery object', function isTreeDefined (assert) {
+			assert.ok($().tree, 'tree method is defined');
+		});
+
+		QUnit.test('should return element', function doesTreeReturnTree (assert) {
+			assert.ok(this.$tree.tree() === this.$tree, 'tree should be initialized');
+		});
+
+		QUnit.test('should have correct defaults', require('./tree-tests/defaults'));
+		QUnit.test('should call dataSource correctly', require('./tree-tests/calls-datasource'));
+		QUnit.test('should be populated by items on initialization', require('./tree-tests/is-populated'));
+		QUnit.test('folder should populate when opened', require('./tree-tests/does-folder-populate'));
+		QUnit.test('getValue alias should function', require('./tree-tests/get-value-alias'));
+
+		QUnit.module( 'Select', {}, function testHomeKeyPresses () {
+			require('./tree-tests/single-select')(QUnit);
+			require('./tree-tests/multi-select')(QUnit);
+		});
+
+		QUnit.test('should not allow selecting items if disabled', require('./tree-tests/disable-select-items'));
+		QUnit.test('should not allow selecting folders if disabled', require('./tree-tests/disable-select-folders'));
+		QUnit.test('folders should open and close correctly', require('./tree-tests/folders-open-close'));
+		QUnit.test('should disclose visible folders', require('./tree-tests/disclose-visible'));
+		QUnit.test('should disclose all folders up to limit, and then close them, then open them all', require('./tree-tests/disclose-all'));
+		QUnit.test('should refresh an already opened/cached folder with new nodes', require('./tree-tests/refresh'));
+		QUnit.test('should accept TEXT as the NAME property in the datasource', require('./tree-tests/tree-accepts-name'));
+
+		QUnit.module( 'Accessibility', {}, function accessibility () {
+			require('./tree-tests/tab-indexes')(QUnit);
+			require('./tree-tests/focus-module')(QUnit);
+			QUnit.module( 'keyboard navigation', {}, function testKeyboardNav () {
+				require('./tree-tests/left-key-module')(QUnit);
+				require('./tree-tests/right-key-module')(QUnit);
+				require('./tree-tests/up-key-module')(QUnit);
+				require('./tree-tests/down-key-module')(QUnit);
+				require('./tree-tests/space-key-module')(QUnit);
+				require('./tree-tests/home-key-module')(QUnit);
+				require('./tree-tests/end-key-module')(QUnit);
+			});
+		});
+
+		QUnit.test('should destroy control', require('./tree-tests/is-destroyed'));
+	});
+});
diff --git a/test/tree-tests/calls-datasource.js b/test/tree-tests/calls-datasource.js
new file mode 100644
index 000000000..c32827f72
--- /dev/null
+++ b/test/tree-tests/calls-datasource.js
@@ -0,0 +1,22 @@
+define(function doesCallDataSourceModule (require) {
+	var $ = require('jquery');
+
+	return function doesCallDataSource (assert) {
+		assert.expect( 3 );
+
+		this.$tree.tree({
+			dataSource: function dataSource (options, callback) {
+				assert.ok(true, 'dataSource function called prior to rendering');
+				assert.equal(typeof options, 'object', 'dataSource provided options object');
+				assert.equal(typeof callback, 'function', 'dataSource provided callback function');
+				callback({
+					data: []
+				});
+			}
+		});
+
+		var $fixture = $( '#qunit-fixture' );
+
+		$fixture.append(this.$tree);
+	};
+});
diff --git a/test/tree-tests/defaults.js b/test/tree-tests/defaults.js
new file mode 100644
index 000000000..82480bb6a
--- /dev/null
+++ b/test/tree-tests/defaults.js
@@ -0,0 +1,12 @@
+define(function correctDefaultsModule () {
+	return function correctDefaults (assert) {
+		var defaults = this.$tree.tree.defaults;
+
+		assert.equal(defaults.multiSelect, false, 'multiSelect defaults to false');
+		assert.equal(defaults.cacheItems, true, 'cacheItems defaults to true');
+		assert.equal(defaults.folderSelect, true, 'folderSelect defaults to true');
+		assert.equal(defaults.itemSelect, true, 'itemSelect defaults to true');
+		assert.equal(defaults.disclosuresUpperLimit, 0, 'disclosuresUpperLimit defaults to 0');
+		assert.ok(defaults.dataSource, 'dataSource exists by default');
+	};
+});
diff --git a/test/tree-tests/disable-select-folders.js b/test/tree-tests/disable-select-folders.js
new file mode 100644
index 000000000..61ee334ba
--- /dev/null
+++ b/test/tree-tests/disable-select-folders.js
@@ -0,0 +1,11 @@
+define(function disableSelectFoldersModule () {
+	return function disableSelectFoldersWorks (assert) {
+		this.$tree.tree({
+			dataSource: this.dataSource,
+			folderSelect: false
+		});
+
+		this.$tree.tree('selectFolder', this.$tree.find('.tree-branch-name:eq(1)'));
+		assert.equal(this.$tree.tree('selectedItems').length, 0, 'Return no value');
+	};
+});
diff --git a/test/tree-tests/disable-select-items.js b/test/tree-tests/disable-select-items.js
new file mode 100644
index 000000000..fd471fcfc
--- /dev/null
+++ b/test/tree-tests/disable-select-items.js
@@ -0,0 +1,11 @@
+define(function disableSelectItemsModule () {
+	return function disableSelectItemsWorks (assert) {
+		this.$tree.tree({
+			dataSource: this.dataSource,
+			itemSelect: false
+		});
+
+		this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(1)'));
+		assert.equal(this.$tree.tree('selectedItems').length, 0, 'Return no value');
+	};
+});
diff --git a/test/tree-tests/disclose-all.js b/test/tree-tests/disclose-all.js
new file mode 100644
index 000000000..43b389fbf
--- /dev/null
+++ b/test/tree-tests/disclose-all.js
@@ -0,0 +1,33 @@
+define(function discloseAllWorksModule () {
+	return function discloseAllWorks (assert) {
+		var ready = assert.async();
+		var $tree = this.$tree2;
+
+		$tree.tree({
+			dataSource: this.dataSource,
+			disclosuresUpperLimit: 2
+		});
+
+		assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, 0, '0 folders open');
+		$tree.one('exceededDisclosuresLimit.fu.tree', function exceededDisclosuresLimit() {
+			assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, 20, '20 folders open');
+
+			$tree.one('closedAll.fu.tree', function closedAll() {
+				assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, 0, '0 folders open');
+
+				$tree.data('ignore-disclosures-limit', true);
+
+				$tree.one('disclosedAll.fu.tree', function disclosedAll () {
+					assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, 200, '200 folders open');
+					ready();
+				});
+
+				$tree.tree('discloseAll');
+			});
+
+			$tree.tree('closeAll');
+		});
+
+		$tree.tree('discloseAll');
+	};
+});
diff --git a/test/tree-tests/disclose-visible.js b/test/tree-tests/disclose-visible.js
new file mode 100644
index 000000000..789f51e69
--- /dev/null
+++ b/test/tree-tests/disclose-visible.js
@@ -0,0 +1,20 @@
+define(function discloseVisibleWorksModule () {
+	return function discloseVisibleWorks (assert) {
+		var ready = assert.async();
+		var $tree = this.$tree;
+		$tree.tree({
+			dataSource: this.dataSource
+		});
+
+		var toBeOpened = $tree.find('.tree-branch:not(".tree-open, .hidden")').length;
+		assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, 0, '0 folders open');
+
+
+		$tree.one('disclosedVisible.fu.tree', function testDiscloseVisible () {
+			assert.equal($tree.find('.tree-branch.tree-open:not(".hidden")').length, toBeOpened, toBeOpened + ' folders open');
+			ready();
+		});
+
+		$tree.tree('discloseVisible');
+	};
+});
diff --git a/test/tree-tests/does-folder-populate.js b/test/tree-tests/does-folder-populate.js
new file mode 100644
index 000000000..a54fa93a9
--- /dev/null
+++ b/test/tree-tests/does-folder-populate.js
@@ -0,0 +1,25 @@
+define(function doesFolderPopulateModule (require) {
+	var NUM_CHILDREN = require('./helpers').constants.NUM_CHILDREN;
+
+	return function doesFolderPopulate (assert) {
+		var $selNode;
+
+		this.$tree.tree({
+			dataSource: this.dataSource
+		});
+
+		$selNode = this.$tree.find('.tree-branch:eq(1)');
+		this.$tree.tree('discloseFolder', $selNode.find('.tree-branch-name'));
+		assert.equal($selNode.find('.tree-branch-children > li').length, NUM_CHILDREN, 'Folder has been populated with items/sub-folders');
+
+
+		this.$selectableFolderTree.tree({
+			dataSource: this.dataSource,
+			folderSelect: true
+		});
+
+		$selNode = this.$selectableFolderTree.find('.tree-branch:eq(1)');
+		this.$selectableFolderTree.tree('discloseFolder', $selNode.find('.tree-branch-header'));
+		assert.equal($selNode.find('.tree-branch-children > li').length, NUM_CHILDREN, 'Folder has been populated with sub-folders and items');
+	};
+});
diff --git a/test/tree-tests/down-key-module.js b/test/tree-tests/down-key-module.js
new file mode 100644
index 000000000..bf262e823
--- /dev/null
+++ b/test/tree-tests/down-key-module.js
@@ -0,0 +1,19 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function downKeyModule (QUnit) {
+		QUnit.module( 'should respond to down key', {}, function testDownKeyPresses () {
+			QUnit.skip('when focus is on node above sibling node, moves focus down to sibling', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is on last focusable child of parent, moves focus out of parent onto first focusable sibling of parent', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is on open branch, moves focus into open branch onto first focusable child', function respondsToKeyboardInput (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/end-key-module.js b/test/tree-tests/end-key-module.js
new file mode 100644
index 000000000..aba54b638
--- /dev/null
+++ b/test/tree-tests/end-key-module.js
@@ -0,0 +1,11 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function endKeyModule (QUnit) {
+		QUnit.module( 'should respond to end key', {}, function testEndKeyPresses () {
+			QUnit.skip('moves focus to last selectable node in tree', function loadTree (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/focus-module.js b/test/tree-tests/focus-module.js
new file mode 100644
index 000000000..ea901ef70
--- /dev/null
+++ b/test/tree-tests/focus-module.js
@@ -0,0 +1,164 @@
+define(function focusModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function focusModule (QUnit) {
+		QUnit.module( 'focusIn', {}, function focusInModule () {
+			QUnit.test('should focus on first focusable branch when nothing is selected', function checkFocusOnNonSelect (assert) {
+				assert.expect( 1 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					$tree.on('focus', function testFocus () {
+						var $focused = $(document.activeElement);
+						var $firstFocusableChild = $($tree.find('li:not(".hidden"):first')[0]);
+						assert.equal($focused.attr('id'), $firstFocusableChild.attr('id'), 'first focusable branch is focused on');
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+
+			QUnit.test('should focus on selected child branch when it is selected', function checkFocusOnSelect (assert) {
+				assert.expect( 1 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					var $secondSelectableChild = $($tree.find('li:not(".hidden")')[1]);
+					$tree.tree('selectItem', $secondSelectableChild);
+
+
+					$tree.on('focus', function testFocus () {
+						var $focused = $(document.activeElement);
+						assert.equal($focused.attr('id'), $secondSelectableChild.attr('id'), 'selected item is focused on');
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+		});
+
+		QUnit.module( 'fixFocusability', {}, function focusInModule () {
+			QUnit.test('should correctly set tabindexes', function tabIndexTest (assert) {
+				assert.expect( 3 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					var $focused = $($tree.find('li:not(".hidden"):first')[0]);
+					assert.equal($focused.attr('tabindex'), undefined, 'tabindex defaults to undefined');
+
+					$tree.on('focus', function testTabIndex () {
+						var $notFocused = $($tree.find('li:not(".hidden, #' + $focused.attr('id') + '")'));
+						var allSetToMinus1 = true;
+
+						$notFocused.each(function gatherIndices (i, elm) {
+							if (parseInt($(elm).attr('tabindex'), 10) >= 0) {
+								allSetToMinus1 = false;
+							}
+						});
+
+						assert.equal($focused.attr('tabindex'), '0', "focused branch's tabindex set to 0");
+						assert.ok(allSetToMinus1, 'All ' + $notFocused.length + " other branch's tab indexes are set to -1");
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+		});
+
+		QUnit.module( 'setFocus', {}, function focusInModule () {
+			QUnit.test("should set tree's aria-activedescendant attr to branch id", function tabIndexTest (assert) {
+				assert.expect( 1 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					$tree.on('focus', function testAriaActive () {
+						var $focused = $(document.activeElement);
+						assert.equal($tree.attr('aria-activedescendant'), $focused.attr('id'), "tree's aria-activedescendant is set to focused branch's ID");
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+
+			QUnit.test('should focus on passed in branch', function tabIndexTest (assert) {
+				assert.expect( 1 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					var $passedInBranch = $($tree.find('li:not(".hidden"):first')[0]);
+
+					$tree.on('focus', function testFocusedBranch () {
+						var $focused = $(document.activeElement);
+						assert.equal($passedInBranch.attr('id'), $focused.attr('id'), 'passed in branch is focused on');
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+
+			QUnit.test('should fire setFocus.fu.tree', function tabIndexTest (assert) {
+				assert.expect( 2 );
+				var $tree = this.$tree;
+
+				$tree.on('loaded.fu.tree', function fireFocus () {
+					var $expectedBranch = $($tree.find('li:not(".hidden"):first')[0]);
+
+					$tree.on('setFocus.fu.tree', function testFiredEvent (e, bubbledBranch) {
+						assert.ok(true, 'setFocus.fu.tree fired.');
+						assert.equal($expectedBranch.attr('id'), $(bubbledBranch).attr('id'), 'bubbled branch is expected branch');
+					});
+
+					var tree = document.getElementById('MyTree');
+
+					var event = new Event('focus');
+
+					tree.dispatchEvent(event);
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/folders-open-close.js b/test/tree-tests/folders-open-close.js
new file mode 100644
index 000000000..97e6b614a
--- /dev/null
+++ b/test/tree-tests/folders-open-close.js
@@ -0,0 +1,25 @@
+define(function foldersOpenCloseModule (require) {
+	var $ = require('jquery');
+
+	return function foldersOpenClose (assert) {
+		this.$tree.tree({
+			dataSource: this.dataSource
+		});
+
+		var $targetBranch = $(this.$tree.find('.tree-branch')[ 0 ]);
+
+		assert.equal($targetBranch.hasClass('tree-open'), false, 'Branch starts closed');
+		this.$tree.tree('discloseFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), true, 'discloseFolder opens folder');
+		this.$tree.tree('discloseFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), true, 'redundant discloseFolder calls leaves folder open');
+		this.$tree.tree('closeFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), false, 'closeFolder closes folder');
+		this.$tree.tree('closeFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), false, 'redundant closeFolder calls leaves folder closed');
+		this.$tree.tree('toggleFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), true, 'toggleFolder on closed folder opens folder');
+		this.$tree.tree('toggleFolder', $targetBranch);
+		assert.equal($targetBranch.hasClass('tree-open'), false, 'toggleFolder on open folder closes folder');
+	};
+});
diff --git a/test/tree-tests/get-value-alias.js b/test/tree-tests/get-value-alias.js
new file mode 100644
index 000000000..424374654
--- /dev/null
+++ b/test/tree-tests/get-value-alias.js
@@ -0,0 +1,11 @@
+define(function getValueAliasModule () {
+	return function getValueAliasWorks (assert) {
+		// MultiSelect: false is the default
+		this.$tree.tree({
+			dataSource: this.dataSource
+		});
+
+		this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(1)'));
+		assert.deepEqual(this.$tree.tree('selectedItems'), this.$tree.tree('getValue'), 'getValue aliases selectedItems');
+	};
+});
diff --git a/test/tree-tests/helpers.js b/test/tree-tests/helpers.js
new file mode 100644
index 000000000..519d450bf
--- /dev/null
+++ b/test/tree-tests/helpers.js
@@ -0,0 +1,189 @@
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
+define(function treeDataFactory (require) {
+	var $ = require('jquery');
+
+	var constants =	{
+		NUM_CHILDREN: 9,
+		NUM_FOLDERS: 4,
+		NUM_ITEMS: 4,
+		NUM_OVERFLOWS: 1
+	};
+
+	var guid = function guid () {
+		var s4 = function s4 () {
+			return Math.floor((1 + Math.random()) * 0x10000)
+				.toString(16)
+				.substring(1);
+		};
+
+		return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+	};
+
+	var callCountData = {
+		data: [
+			{
+				'name': 'Convex and Concave',
+				'type': 'item',
+				'attr': {
+					'id': 'item4'
+				}
+			}
+		]
+	};
+
+	var textData = {
+		data: [
+			{
+				text: 'node text',
+				type: 'folder',
+				attr: {
+					id: 'folder1'
+				}
+			}
+		]
+	};
+
+	var treeData = function generateTreeData () {
+		return {
+			data: [
+				{
+					name: 'Ascending and Descending',
+					type: 'folder',
+					attr: {
+						id: 'folder' + guid()
+					}
+				},
+				{
+					name: 'Sky and Water I (with custom icon)',
+					type: 'item',
+					attr: {
+						id: 'folder' + guid(),
+						'data-icon': 'glyphicon glyphicon-file'
+					}
+				},
+				{
+					name: 'Drawing Hands',
+					type: 'folder',
+					attr: {
+						id: 'folder' + guid(),
+						'data-children': false
+					}
+				},
+				{
+					name: 'Waterfall',
+					type: 'item',
+					attr: {
+						id: 'item2'
+					}
+				},
+				{
+					name: 'Belvedere',
+					type: 'folder',
+					attr: {
+						id: 'folder' + guid()
+					}
+				},
+				{
+					name: 'Relativity (with custom icon)',
+					type: 'item',
+					attr: {
+						id: 'item3',
+						'data-icon': 'glyphicon glyphicon-picture'
+					}
+				},
+				{
+					name: 'House of Stairs',
+					type: 'folder',
+					attr: {
+						id: 'folder' + guid()
+					}
+				},
+				{
+					name: 'Convex and Concave',
+					type: 'item',
+					attr: {
+						id: 'item4'
+					}
+				},
+				{
+					name: 'Load More',
+					type: 'overflow',
+					attr: {
+						id: 'overflow1'
+					}
+				}
+			]
+		};
+	};
+
+	var KEYMAP = {
+		enter: 13,
+		space: 32,
+		end: 35,
+		home: 36,
+		left: 37,
+		up: 38,
+		right: 39,
+		down: 40
+	};
+
+	var getKeyDown = function getKeyDown (which, $target) {
+		var eventObject = this.defaultEventObject;
+		eventObject.which = KEYMAP[which];
+
+		if ($target) {
+			eventObject.originalEvent = $.Event( 'keydown', { // eslint-disable-line new-cap
+				target: $target
+			});
+		}
+
+		return $.Event( 'keydown', eventObject); // eslint-disable-line new-cap
+	};
+
+	var setup = function setup () {
+		var callLimit = 50;
+		var callCount = 0;
+
+		this.dataSource = function genDataSource (options, callback) {
+			if (callCount >= callLimit) {
+				callback(callCountData, 400);
+				return;
+			}
+
+			callCount++;
+
+			callback(treeData());
+		};
+
+		this.textDataSource = function textDataSource (options, callback) {
+			callback(textData);
+		};
+
+		var $fixture = $( '#qunit-fixture' );
+		this.html = require('text!test/markup/tree-markup.html!strip');
+		this.$html = $(this.html);
+		$fixture.append(this.$html);
+		this.$tree = $fixture.find('#MyTree');
+		this.$tree2 = $fixture.find('#MyTree2');
+		this.$selectableFolderTree = $fixture.find('#MyTreeSelectableFolder');
+
+		this.defaultEventObject = {
+			originalEvent: $.Event( 'keydown', { // eslint-disable-line new-cap
+				target: this.$tree.find('li:not(".hidden"):first')
+			}),
+			which: 37
+		};
+
+		this.getKeyDown = getKeyDown;
+	};
+
+	return {
+		treeData: treeData,
+		callCountData: callCountData,
+		textData: textData,
+		constants: constants,
+		setup: setup
+	};
+});
diff --git a/test/tree-tests/home-key-module.js b/test/tree-tests/home-key-module.js
new file mode 100644
index 000000000..578b20016
--- /dev/null
+++ b/test/tree-tests/home-key-module.js
@@ -0,0 +1,11 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function homeKeyModule (QUnit) {
+		QUnit.module( 'should respond to home key', {}, function testHomeKeyPresses () {
+			QUnit.skip('moves focus to first selectable node in tree', function loadTree (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/is-destroyed.js b/test/tree-tests/is-destroyed.js
new file mode 100644
index 000000000..df283c046
--- /dev/null
+++ b/test/tree-tests/is-destroyed.js
@@ -0,0 +1,6 @@
+define(function Module () {
+	return function destroyWorks (assert) {
+		assert.equal(typeof (this.$tree.tree('destroy')), 'string', 'returns string (markup)');
+		assert.equal(this.$tree.parent().length, false, 'control has been removed from DOM');
+	};
+});
diff --git a/test/tree-tests/is-populated.js b/test/tree-tests/is-populated.js
new file mode 100644
index 000000000..dc9144d63
--- /dev/null
+++ b/test/tree-tests/is-populated.js
@@ -0,0 +1,14 @@
+define(function isTreePopulatedModule (require) {
+	var constants = require('./helpers').constants;
+
+	return function isTreePopulated (assert) {
+		assert.expect( 3 );
+		this.$tree.tree({
+			dataSource: this.dataSource
+		});
+
+		assert.equal(this.$tree.find('.tree-branch:not([data-template])').length, constants.NUM_FOLDERS, 'Initial set of folders have been added');
+		assert.equal(this.$tree.find('.tree-item:not([data-template])').length, constants.NUM_ITEMS, 'Initial set of items have been added');
+		assert.equal(this.$tree.find('.tree-overflow:not([data-template])').length, constants.NUM_OVERFLOWS, 'Initial overflow has been added');
+	};
+});
diff --git a/test/tree-tests/left-key-module.js b/test/tree-tests/left-key-module.js
new file mode 100644
index 000000000..e4306b74c
--- /dev/null
+++ b/test/tree-tests/left-key-module.js
@@ -0,0 +1,109 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function leftKeyModule (QUnit) {
+		QUnit.module( 'should respond to left key', {}, function testLeftKeyPresses () {
+			QUnit.test('on top node when branch is closed', function loadTree (assert) {
+				assert.expect( 3 );
+				var $tree = this.$tree;
+				var leftKeyDown = this.getKeyDown('left');
+
+				$tree.one('loaded.fu.tree', function selectFolder () {
+					$tree.one('selected.fu.tree', function triggerKeypress () {
+						var $focused = $(document.activeElement);
+						assert.ok(!$focused.hasClass('tree-open'), 'key is being pressed on closed folder.');
+						$tree.one('keyboardNavigated.fu.tree', function testFocus () {
+							var $afterKeypressFocus = $(document.activeElement);
+							assert.equal($focused.attr('id'), $afterKeypressFocus.attr('id'), 'focus does not change upon keypress.');
+							assert.ok(!$focused.hasClass('tree-open'), 'folder is still closed.');
+						});
+
+						$focused.trigger(leftKeyDown);
+					});
+
+					// focus on first selectable folder
+					$tree.tree('selectFolder', $($tree.find('.tree-branch:not(".hidden")')[0]));
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+
+			QUnit.skip('on child node when branch is closed', function loadTree (assert) {
+				assert.expect( 4 );
+				var $tree = this.$tree;
+				var self = this;
+
+				$tree.one('loaded.fu.tree', function selectFolder () {
+					$tree.one('setFocus.fu.tree', function triggerDisclosure () {
+						var $finalTargetFolder = $(document.activeElement);
+
+						$tree.one('disclosedFolder.fu.tree', function triggerKeypress () {
+							$tree.one('setFocus.fu.tree', function selectChildFolder () {
+								var $focused = $(document.activeElement);
+
+								assert.notOk($focused.hasClass('tree-open'), 'key is being pressed on closed folder.');
+								assert.notEqual($focused.attr('id'), $finalTargetFolder.attr('id'), 'focus has changed from initially targeted folder.');
+								$tree.on('keyboardNavigated.fu.tree', function testFocus () {
+									var $finalFocusedFolder = $(document.activeElement);
+
+									assert.equal($finalFocusedFolder.attr('id'), $finalTargetFolder.attr('id'), 'focus has changed.');
+									assert.notOk($focused.hasClass('tree-open'), 'folder is now closed.');
+								});
+								var leftKeyDown = self.getKeyDown('left', $focused);
+
+								$focused.trigger(leftKeyDown);
+							});
+
+							// focus on first selectable folder
+							$tree.tree('selectFolder', $($finalTargetFolder.find('.tree-branch:not(".hidden")')[0]));
+						});
+
+						$tree.tree('discloseFolder', $($tree.find('.tree-branch:not(".hidden")')[0]));
+					});
+
+					// focus on first selectable folder
+					$tree.tree('selectFolder', $($tree.find('.tree-branch:not(".hidden")')[0]));
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+
+			QUnit.test('when branch is disclosed, closes branch', function respondsToKeyboardInput (assert) {
+				assert.expect( 3 );
+				var $tree = this.$tree;
+				var self = this;
+
+				$tree.one('loaded.fu.tree', function selectFolder () {
+					$tree.one('setFocus.fu.tree', function triggerDisclosure () {
+						$tree.one('disclosedFolder.fu.tree', function triggerKeypress () {
+							var $focused = $(document.activeElement);
+
+							assert.ok($focused.hasClass('tree-open'), 'key is being pressed on open folder.');
+							$tree.on('keyboardNavigated.fu.tree', function testFocus () {
+								var $afterKeypressFocus = $(document.activeElement);
+								assert.equal($focused.attr('id'), $afterKeypressFocus.attr('id'), 'focus does not change upon keypress.');
+								assert.ok(!$focused.hasClass('tree-open'), 'folder is now closed.');
+							});
+							var leftKeyDown = self.getKeyDown('left', $focused);
+
+							$focused.trigger(leftKeyDown);
+						});
+
+						$tree.tree('discloseFolder', $($tree.find('.tree-branch:not(".hidden")')[0]));
+					});
+
+					// focus on first selectable folder
+					$tree.tree('selectFolder', $($tree.find('.tree-branch:not(".hidden")')[0]));
+				});
+
+				$tree.tree({
+					dataSource: this.dataSource
+				});
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/multi-select.js b/test/tree-tests/multi-select.js
new file mode 100644
index 000000000..c3bea77a9
--- /dev/null
+++ b/test/tree-tests/multi-select.js
@@ -0,0 +1,77 @@
+define(function multiSelectWorksModuleFactory () {
+	return function multiSelectWorksModule (QUnit) {
+		QUnit.module( 'multi', {}, function testDownKeyPresses () {
+			QUnit.test('item works as designed', function loadTree (assert) {
+				this.$tree.tree({
+					dataSource: this.dataSource,
+					multiSelect: true
+				});
+
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(1)'));
+				assert.equal(this.$tree.tree('selectedItems').length, 1, 'Return single selected value');
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(2)'));
+				assert.equal(this.$tree.tree('selectedItems').length, 2, 'Return multiple selected values');
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(1)'));
+				assert.equal(this.$tree.tree('selectedItems').length, 1, 'Return single selected value');
+			});
+
+			QUnit.test('folder works as designed', function loadTree (assert) {
+				this.$selectableFolderTree.tree({
+					dataSource: this.dataSource,
+					multiSelect: true,
+					folderSelect: true
+				});
+
+				this.$selectableFolderTree.tree('selectFolder', this.$selectableFolderTree.find('.tree-branch:eq(1)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected value');
+				this.$selectableFolderTree.tree('selectFolder', this.$selectableFolderTree.find('.tree-branch:eq(2)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 2, 'Return multiple selected values');
+				this.$selectableFolderTree.tree('selectFolder', this.$selectableFolderTree.find('.tree-branch:eq(1)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected value');
+			});
+
+			QUnit.test('adds and removes aria-selected="true" to/from selected items', function loadTree (assert) {
+				this.$tree.tree({
+					dataSource: this.dataSource,
+					multiSelect: true
+				});
+
+				var $toSelect1 = this.$tree.find('.tree-item:eq(1)');
+				var $toSelect2 = this.$tree.find('.tree-item:eq(2)');
+
+				assert.equal($toSelect1.attr('aria-selected'), 'false', "item 1's aria-selected attr present and set to false");
+				assert.equal($toSelect2.attr('aria-selected'), 'false', "item 2's aria-selected attr present and set to false");
+
+				this.$tree.tree('selectItem', $toSelect1);
+				assert.ok($toSelect1.attr('aria-selected'), 'newly selected item 1 contains aria-selected="true"');
+				assert.equal($toSelect2.attr('aria-selected'), 'false', "item 2's aria-selected attr still present and still set to false");
+
+				this.$tree.tree('selectItem', $toSelect2);
+				assert.ok($toSelect1.attr('aria-selected'), 'previously selected item 1 still contains aria-selected="true"');
+				assert.ok($toSelect1.attr('aria-selected'), 'newly selected item 2 now contains aria-selected="true"');
+			});
+
+			QUnit.test('adds and removes aria-selected="true" to/from selected folders', function loadTree (assert) {
+				this.$selectableFolderTree.tree({
+					dataSource: this.dataSource,
+					multiSelect: true,
+					folderSelect: true
+				});
+
+				var $toSelect1 = this.$selectableFolderTree.find('.tree-branch:eq(1)');
+				var $toSelect2 = this.$selectableFolderTree.find('.tree-branch:eq(2)');
+
+				assert.equal($toSelect1.attr('aria-selected'), 'false', "item 1's aria-selected attr present and set to false");
+				assert.equal($toSelect2.attr('aria-selected'), 'false', "item 2's aria-selected attr present and set to false");
+
+				this.$selectableFolderTree.tree('selectItem', $toSelect1);
+				assert.ok($toSelect1.attr('aria-selected'), 'newly selected item 1 contains aria-selected="true"');
+				assert.equal($toSelect2.attr('aria-selected'), 'false', "item 2's aria-selected attr still present and still set to false");
+
+				this.$selectableFolderTree.tree('selectItem', $toSelect2);
+				assert.ok($toSelect1.attr('aria-selected'), 'previously selected item 1 still contains aria-selected="true"');
+				assert.ok($toSelect1.attr('aria-selected'), 'newly selected item 2 now contains aria-selected="true"');
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/refresh.js b/test/tree-tests/refresh.js
new file mode 100644
index 000000000..5c13908a5
--- /dev/null
+++ b/test/tree-tests/refresh.js
@@ -0,0 +1,25 @@
+define(function refreshWorksModule (require) {
+	var NUM_CHILDREN = require('./helpers').constants.NUM_CHILDREN;
+
+	return function refreshWorks (assert) {
+		var $folderToRefresh;
+		var initialLoadedFolderId;
+		var refreshedLoadedFolderId;
+		var selector = '.tree-branch-children > li:eq(0)';
+
+		this.$tree.tree({
+			dataSource: this.dataSource
+		});
+		$folderToRefresh = this.$tree.find('.tree-branch:eq(1)');
+
+		// Open folder
+		this.$tree.tree('discloseFolder', $folderToRefresh.find('.tree-branch-name'));
+		assert.equal($folderToRefresh.find('.tree-branch-children > li').length, NUM_CHILDREN, 'Folder has been populated with items/sub-folders');
+		initialLoadedFolderId = $folderToRefresh.find(selector).attr('id');
+
+		// Refresh and see if it's the same ID
+		this.$tree.tree('refreshFolder', $folderToRefresh);
+		refreshedLoadedFolderId = $folderToRefresh.find('.tree-branch-children > li:eq(0)').attr('id');
+		assert.notEqual(refreshedLoadedFolderId, initialLoadedFolderId, 'Folder has been refreshed and populated with different items/sub-folders');
+	};
+});
diff --git a/test/tree-tests/right-key-module.js b/test/tree-tests/right-key-module.js
new file mode 100644
index 000000000..14a188cda
--- /dev/null
+++ b/test/tree-tests/right-key-module.js
@@ -0,0 +1,15 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function rightKeyModule (QUnit) {
+		QUnit.module( 'should respond to right key', {}, function testRightKeyPresses () {
+			QUnit.skip('when branch is closed, discloses branch', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when branch is disclosed, focuses into branch', function respondsToKeyboardInput (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/single-select.js b/test/tree-tests/single-select.js
new file mode 100644
index 000000000..87b7c5448
--- /dev/null
+++ b/test/tree-tests/single-select.js
@@ -0,0 +1,72 @@
+define(function singleSelectWorksModuleFactory () {
+	var $ = require('jquery');
+
+	return function singleSelectWorksModule (QUnit) {
+		QUnit.module( 'single', {}, function testDownKeyPresses () {
+			QUnit.test('item works as designed', function loadTree (assert) {
+				// MultiSelect: false is the default
+				this.$tree.tree({
+					dataSource: this.dataSource
+				});
+
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(1)'));
+				assert.equal(this.$tree.tree('selectedItems').length, 1, 'Return single selected value');
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(2)'));
+				assert.equal(this.$tree.tree('selectedItems').length, 1, 'Return new single selected value');
+			});
+
+			QUnit.test('folder works as designed', function loadTree (assert) {
+				this.$selectableFolderTree.tree({
+					dataSource: this.dataSource,
+					folderSelect: true
+				});
+
+				this.$selectableFolderTree.tree('selectItem', this.$selectableFolderTree.find('.tree-item:eq(1)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected item (none previously selected, 1st programatic selection)');
+
+				this.$selectableFolderTree.tree('selectFolder', this.$selectableFolderTree.find('.tree-branch:eq(1)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected folder (item previously selected, 2nd programatic selection)');
+
+				this.$selectableFolderTree.tree('selectItem', this.$selectableFolderTree.find('.tree-item:eq(2)'));
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected item (folder previously selected, 3rd programatic selection)');
+
+				this.$selectableFolderTree.find('.tree-item:eq(1)').click();
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected item (item previously selected, 1st click selection)');
+
+				this.$selectableFolderTree.find('.tree-branch:eq(1)').click();
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected folder (item previously selected, 2nd click selection)');
+
+				this.$selectableFolderTree.find('.tree-item:eq(2)').click();
+				assert.equal(this.$selectableFolderTree.tree('selectedItems').length, 1, 'Return single selected item (folder previously selected, 3rd click selection)');
+			});
+
+			QUnit.test('adds and removes aria-selected="true" to/from selected item', function loadTree (assert) {
+				// MultiSelect: false is the default
+				this.$tree.tree({
+					dataSource: this.dataSource
+				});
+
+				var $toSelect = this.$tree.find('.tree-item:eq(1)');
+				assert.equal($toSelect.attr('aria-selected'), 'false', "item's aria-selected attr present and set to false");
+				this.$tree.tree('selectItem', $toSelect);
+				assert.ok($toSelect.attr('aria-selected'), 'newly selected item contains aria-selected="true"');
+				this.$tree.tree('selectItem', this.$tree.find('.tree-item:eq(2)'));
+				assert.equal($toSelect.attr('aria-selected'), 'false', "newly deselected item's aria-selected attr present and set to false");
+			});
+
+			QUnit.test('adds and removes aria-selected="true" to/from selected folder', function loadTree (assert) {
+				this.$selectableFolderTree.tree({
+					dataSource: this.dataSource,
+					folderSelect: true
+				});
+
+				var $toSelect = this.$selectableFolderTree.find('.tree-branch:eq(1)');
+				assert.equal($toSelect.attr('aria-selected'), 'false', "item's aria-selected attr present and set to false");
+				this.$selectableFolderTree.tree('selectItem', $toSelect);
+				assert.ok($toSelect.attr('aria-selected'), 'newly selected item contains aria-selected="true"');
+				this.$selectableFolderTree.tree('selectItem', this.$selectableFolderTree.find('.tree-item:eq(2)'));
+				assert.equal($toSelect.attr('aria-selected'), 'false', "newly deselected item's aria-selected attr present and set to false");
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/space-key-module.js b/test/tree-tests/space-key-module.js
new file mode 100644
index 000000000..f7e5ae92e
--- /dev/null
+++ b/test/tree-tests/space-key-module.js
@@ -0,0 +1,19 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function spaceKeyModule (QUnit) {
+		QUnit.module( 'should respond to space key', {}, function testSpaceKeyPresses () {
+			QUnit.skip('when focus is on selectable node, select node', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is on non-selectable, disclose-able node, toggles node', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is on non-selectable, non-disclose-able node, clicks on node (this is probably "loading...")', function respondsToKeyboardInput (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/tab-indexes.js b/test/tree-tests/tab-indexes.js
new file mode 100644
index 000000000..2d56dfd73
--- /dev/null
+++ b/test/tree-tests/tab-indexes.js
@@ -0,0 +1,21 @@
+define(function Module (require) {
+	var $ = require('jquery');
+	var html = require('text!test/markup/tree-markup.html!strip');
+
+	return function tabIndexModule (QUnit) {
+		QUnit.module( 'tab indexes', {}, function testTabIndexes () {
+			QUnit.skip('are all set to -1 on tree load', function loadTree (assert) {
+
+			});
+			QUnit.skip('are set to 1 for selected items', function loadTree (assert) {
+
+			});
+			QUnit.skip('are all set to -1 on new item selection', function loadTree (assert) {
+
+			});
+			QUnit.skip('root tree element is set to -1 on item selection', function loadTree (assert) {
+
+			});
+		});
+	};
+});
diff --git a/test/tree-tests/tree-accepts-name.js b/test/tree-tests/tree-accepts-name.js
new file mode 100644
index 000000000..3e52f1176
--- /dev/null
+++ b/test/tree-tests/tree-accepts-name.js
@@ -0,0 +1,10 @@
+define(function treeAcceptsNameModule () {
+	return function treeAcceptsName (assert) {
+		this.$tree.tree({
+			dataSource: this.textDataSource
+		});
+
+		this.$tree.tree('selectFolder', this.$tree.find('.tree-branch-name:eq(1)'));
+		assert.equal(this.$tree.tree('selectedItems')[ 0 ].text, 'node text', 'Param TEXT used in the datasource');
+	};
+});
diff --git a/test/tree-tests/up-key-module.js b/test/tree-tests/up-key-module.js
new file mode 100644
index 000000000..f0005ae66
--- /dev/null
+++ b/test/tree-tests/up-key-module.js
@@ -0,0 +1,19 @@
+define(function keyboardNavigationModuleFactory (require) {
+	var $ = require('jquery');
+
+	return function upKeyModule (QUnit) {
+		QUnit.module( 'should respond to up key', {}, function testUpKeyPresses () {
+			QUnit.skip('when focus is on node below sibling node, moves focus up to sibling', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is below open sibling, moves focus into last focusable child of sibling', function loadTree (assert) {
+
+			});
+
+			QUnit.skip('when focus is in first child of open branch, moves focus onto parent', function respondsToKeyboardInput (assert) {
+
+			});
+		});
+	};
+});