diff --git a/_base.js b/_base.js
deleted file mode 100644
index 671f99f5b..000000000
--- a/_base.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define([
-	"./main",
-	"./a11y",	// used to be in dijit/_base/manager
-	"./WidgetSet",	// used to be in dijit/_base/manager
-	"./_base/focus",
-	"./_base/manager",
-	"./_base/place",
-	"./_base/popup",
-	"./_base/scroll",
-	"./_base/sniff",
-	"./_base/typematic",
-	"./_base/wai",
-	"./_base/window"
-], function(dijit){
-
-	// module:
-	//		dijit/_base
-
-	/*=====
-	return {
-		// summary:
-		//		Includes all the modules in dijit/_base
-	};
-	=====*/
-
-	return dijit._base;
-});
diff --git a/_base/focus.js b/_base/focus.js
deleted file mode 100644
index 94f3071ca..000000000
--- a/_base/focus.js
+++ /dev/null
@@ -1,207 +0,0 @@
-define([
-	"dojo/_base/array", // array.forEach
-	"dojo/dom", // dom.isDescendant
-	"dojo/_base/lang", // lang.isArray
-	"dojo/topic", // publish
-	"dojo/_base/window", // win.doc win.doc.selection win.global win.global.getSelection win.withGlobal
-	"../focus",
-	"../selection",
-	"../main"	// for exporting symbols to dijit
-], function(array, dom, lang, topic, win, focus, selection, dijit){
-
-	// module:
-	//		dijit/_base/focus
-
-	var exports = {
-		// summary:
-		//		Deprecated module to monitor currently focused node and stack of currently focused widgets.
-		//		New code should access dijit/focus directly.
-
-		// _curFocus: DomNode
-		//		Currently focused item on screen
-		_curFocus: null,
-
-		// _prevFocus: DomNode
-		//		Previously focused item on screen
-		_prevFocus: null,
-
-		isCollapsed: function(){
-			// summary:
-			//		Returns true if there is no text selected
-			return dijit.getBookmark().isCollapsed;
-		},
-
-		getBookmark: function(){
-			// summary:
-			//		Retrieves a bookmark that can be used with moveToBookmark to return to the same range
-			var sel = win.global == window ? selection : new selection.SelectionManager(win.global);
-			return sel.getBookmark();
-		},
-
-		moveToBookmark: function(/*Object*/ bookmark){
-			// summary:
-			//		Moves current selection to a bookmark
-			// bookmark:
-			//		This should be a returned object from dijit.getBookmark()
-
-			var sel = win.global == window ? selection : new selection.SelectionManager(win.global);
-			return sel.moveToBookmark(bookmark);
-		},
-
-		getFocus: function(/*Widget?*/ menu, /*Window?*/ openedForWindow){
-			// summary:
-			//		Called as getFocus(), this returns an Object showing the current focus
-			//		and selected text.
-			//
-			//		Called as getFocus(widget), where widget is a (widget representing) a button
-			//		that was just pressed, it returns where focus was before that button
-			//		was pressed.   (Pressing the button may have either shifted focus to the button,
-			//		or removed focus altogether.)   In this case the selected text is not returned,
-			//		since it can't be accurately determined.
-			//
-			// menu: dijit/_WidgetBase|{domNode: DomNode} structure
-			//		The button that was just pressed.  If focus has disappeared or moved
-			//		to this button, returns the previous focus.  In this case the bookmark
-			//		information is already lost, and null is returned.
-			//
-			// openedForWindow:
-			//		iframe in which menu was opened
-			//
-			// returns:
-			//		A handle to restore focus/selection, to be passed to `dijit.focus`
-			var node = !focus.curNode || (menu && dom.isDescendant(focus.curNode, menu.domNode)) ? dijit._prevFocus : focus.curNode;
-			return {
-				node: node,
-				bookmark: node && (node == focus.curNode) && win.withGlobal(openedForWindow || win.global, dijit.getBookmark),
-				openedForWindow: openedForWindow
-			}; // Object
-		},
-
-		// _activeStack: dijit/_WidgetBase[]
-		//		List of currently active widgets (focused widget and it's ancestors)
-		_activeStack: [],
-
-		registerIframe: function(/*DomNode*/ iframe){
-			// summary:
-			//		Registers listeners on the specified iframe so that any click
-			//		or focus event on that iframe (or anything in it) is reported
-			//		as a focus/click event on the `<iframe>` itself.
-			// description:
-			//		Currently only used by editor.
-			// returns:
-			//		Handle to pass to unregisterIframe()
-			return focus.registerIframe(iframe);
-		},
-
-		unregisterIframe: function(/*Object*/ handle){
-			// summary:
-			//		Unregisters listeners on the specified iframe created by registerIframe.
-			//		After calling be sure to delete or null out the handle itself.
-			// handle:
-			//		Handle returned by registerIframe()
-
-			handle && handle.remove();
-		},
-
-		registerWin: function(/*Window?*/targetWindow, /*DomNode?*/ effectiveNode){
-			// summary:
-			//		Registers listeners on the specified window (either the main
-			//		window or an iframe's window) to detect when the user has clicked somewhere
-			//		or focused somewhere.
-			// description:
-			//		Users should call registerIframe() instead of this method.
-			// targetWindow:
-			//		If specified this is the window associated with the iframe,
-			//		i.e. iframe.contentWindow.
-			// effectiveNode:
-			//		If specified, report any focus events inside targetWindow as
-			//		an event on effectiveNode, rather than on evt.target.
-			// returns:
-			//		Handle to pass to unregisterWin()
-
-			return focus.registerWin(targetWindow, effectiveNode);
-		},
-
-		unregisterWin: function(/*Handle*/ handle){
-			// summary:
-			//		Unregisters listeners on the specified window (either the main
-			//		window or an iframe's window) according to handle returned from registerWin().
-			//		After calling be sure to delete or null out the handle itself.
-
-			handle && handle.remove();
-		}
-	};
-
-	// Override focus singleton's focus function so that dijit.focus()
-	// has backwards compatible behavior of restoring selection (although
-	// probably no one is using that).
-	focus.focus = function(/*Object|DomNode */ handle){
-		// summary:
-		//		Sets the focused node and the selection according to argument.
-		//		To set focus to an iframe's content, pass in the iframe itself.
-		// handle:
-		//		object returned by get(), or a DomNode
-
-		if(!handle){ return; }
-
-		var node = "node" in handle ? handle.node : handle,		// because handle is either DomNode or a composite object
-			bookmark = handle.bookmark,
-			openedForWindow = handle.openedForWindow,
-			collapsed = bookmark ? bookmark.isCollapsed : false;
-
-		// Set the focus
-		// Note that for iframe's we need to use the <iframe> to follow the parentNode chain,
-		// but we need to set focus to iframe.contentWindow
-		if(node){
-			var focusNode = (node.tagName.toLowerCase() == "iframe") ? node.contentWindow : node;
-			if(focusNode && focusNode.focus){
-				try{
-					// Gecko throws sometimes if setting focus is impossible,
-					// node not displayed or something like that
-					focusNode.focus();
-				}catch(e){/*quiet*/}
-			}
-			focus._onFocusNode(node);
-		}
-
-		// set the selection
-		// do not need to restore if current selection is not empty
-		// (use keyboard to select a menu item) or if previous selection was collapsed
-		// as it may cause focus shift (Esp in IE).
-		if(bookmark && win.withGlobal(openedForWindow || win.global, dijit.isCollapsed) && !collapsed){
-			if(openedForWindow){
-				openedForWindow.focus();
-			}
-			try{
-				win.withGlobal(openedForWindow || win.global, dijit.moveToBookmark, null, [bookmark]);
-			}catch(e2){
-				/*squelch IE internal error, see http://trac.dojotoolkit.org/ticket/1984 */
-			}
-		}
-	};
-
-	// For back compatibility, monitor changes to focused node and active widget stack,
-	// publishing events and copying changes from focus manager variables into dijit (top level) variables
-	focus.watch("curNode", function(name, oldVal, newVal){
-		dijit._curFocus = newVal;
-		dijit._prevFocus = oldVal;
-		if(newVal){
-			topic.publish("focusNode", newVal);	// publish
-		}
-	});
-	focus.watch("activeStack", function(name, oldVal, newVal){
-		dijit._activeStack = newVal;
-	});
-
-	focus.on("widget-blur", function(widget, by){
-		topic.publish("widgetBlur", widget, by);	// publish
-	});
-	focus.on("widget-focus", function(widget, by){
-		topic.publish("widgetFocus", widget, by);	// publish
-	});
-
-	lang.mixin(dijit, exports);
-
-	/*===== return exports; =====*/
-	return dijit;	// for back compat :-(
-});
diff --git a/_base/manager.js b/_base/manager.js
index 7f4f7edd9..9560404cf 100644
--- a/_base/manager.js
+++ b/_base/manager.js
@@ -1,35 +1,16 @@
 define([
-	"dojo/_base/array",
-	"dojo/_base/config", // defaultDuration
-	"dojo/_base/lang",
-	"../registry",
-	"../main"	// for setting exports to dijit namespace
-], function(array, config, lang, registry, dijit){
+	"dojo/_base/config" // defaultDuration
+], function(config){
 
 	// module:
 	//		dijit/_base/manager
 
-	var exports = {
-		// summary:
-		//		Deprecated.  Shim to methods on registry, plus a few other declarations.
-		//		New code should access dijit/registry directly when possible.
-	};
-
-	array.forEach(["byId", "getUniqueId", "findWidgets", "_destroyAll", "byNode", "getEnclosingWidget"], function(name){
-		exports[name] = registry[name];
-	});
-
-	 lang.mixin(exports, {
+	return {
 		 // defaultDuration: Integer
 		 //		The default fx.animation speed (in ms) to use for all Dijit
 		 //		transitional fx.animations, unless otherwise specified
-		 //		on a per-instance basis. Defaults to 200, overrided by
+		 //		on a per-instance basis. Defaults to 200, overriden by
 		 //		`djConfig.defaultDuration`
 		 defaultDuration: config["defaultDuration"] || 200
-	 });
-
-	lang.mixin(dijit, exports);
-
-	/*===== return exports; =====*/
-	return dijit;	// for back compat :-(
+	 };
 });
diff --git a/_base/place.js b/_base/place.js
deleted file mode 100644
index dbfd2a63a..000000000
--- a/_base/place.js
+++ /dev/null
@@ -1,131 +0,0 @@
-define([
-	"dojo/_base/array", // array.forEach
-	"dojo/_base/lang", // lang.isArray, lang.mixin
-	"dojo/window", // windowUtils.getBox
-	"../place",
-	"../main"	// export to dijit namespace
-], function(array, lang, windowUtils, place, dijit){
-
-	// module:
-	//		dijit/_base/place
-
-
-	var exports = {
-		// summary:
-		//		Deprecated back compatibility module, new code should use dijit/place directly instead of using this module.
-	};
-
-	exports.getViewport = function(){
-		// summary:
-		//		Deprecated method to return the dimensions and scroll position of the viewable area of a browser window.
-		//		New code should use windowUtils.getBox()
-
-		return windowUtils.getBox();
-	};
-
-	exports.placeOnScreen = place.at;
-
-	exports.placeOnScreenAroundElement = function(node, aroundNode, aroundCorners, layoutNode){
-		// summary:
-		//		Like dijit.placeOnScreenAroundNode(), except it accepts an arbitrary object
-		//		for the "around" argument and finds a proper processor to place a node.
-		//		Deprecated, new code should use dijit/place.around() instead.
-
-		// Convert old style {"BL": "TL", "BR": "TR"} type argument
-		// to style needed by dijit.place code:
-		//		[
-		//			{aroundCorner: "BL", corner: "TL" },
-		//			{aroundCorner: "BR", corner: "TR" }
-		//		]
-		var positions;
-		if(lang.isArray(aroundCorners)){
-			positions = aroundCorners;
-		}else{
-			positions = [];
-			for(var key in aroundCorners){
-				positions.push({aroundCorner: key, corner: aroundCorners[key]});
-			}
-		}
-
-		return place.around(node, aroundNode, positions, true, layoutNode);
-	};
-
-	exports.placeOnScreenAroundNode = exports.placeOnScreenAroundElement;
-	/*=====
-	exports.placeOnScreenAroundNode = function(node, aroundNode, aroundCorners, layoutNode){
-		// summary:
-		//		Position node adjacent or kitty-corner to aroundNode
-		//		such that it's fully visible in viewport.
-		//		Deprecated, new code should use dijit/place.around() instead.
-	};
-	=====*/
-
-	exports.placeOnScreenAroundRectangle = exports.placeOnScreenAroundElement;
-	/*=====
-	exports.placeOnScreenAroundRectangle = function(node, aroundRect, aroundCorners, layoutNode){
-		// summary:
-		//		Like dijit.placeOnScreenAroundNode(), except that the "around"
-		//		parameter is an arbitrary rectangle on the screen (x, y, width, height)
-		//		instead of a dom node.
-		//		Deprecated, new code should use dijit/place.around() instead.
-	};
-	=====*/
-
-	exports.getPopupAroundAlignment = function(/*Array*/ position, /*Boolean*/ leftToRight){
-		// summary:
-		//		Deprecated method, unneeded when using dijit/place directly.
-		//		Transforms the passed array of preferred positions into a format suitable for
-		//		passing as the aroundCorners argument to dijit/place.placeOnScreenAroundElement.
-		// position: String[]
-		//		This variable controls the position of the drop down.
-		//		It's an array of strings with the following values:
-		//
-		//		- before: places drop down to the left of the target node/widget, or to the right in
-		//		  the case of RTL scripts like Hebrew and Arabic
-		//		- after: places drop down to the right of the target node/widget, or to the left in
-		//		  the case of RTL scripts like Hebrew and Arabic
-		//		- above: drop down goes above target node
-		//		- below: drop down goes below target node
-		//
-		//		The list is positions is tried, in order, until a position is found where the drop down fits
-		//		within the viewport.
-		// leftToRight: Boolean
-		//		Whether the popup will be displaying in leftToRight mode.
-
-		var align = {};
-		array.forEach(position, function(pos){
-			var ltr = leftToRight;
-			switch(pos){
-				case "after":
-					align[leftToRight ? "BR" : "BL"] = leftToRight ? "BL" : "BR";
-					break;
-				case "before":
-					align[leftToRight ? "BL" : "BR"] = leftToRight ? "BR" : "BL";
-					break;
-				case "below-alt":
-					ltr = !ltr;
-					// fall through
-				case "below":
-					// first try to align left borders, next try to align right borders (or reverse for RTL mode)
-					align[ltr ? "BL" : "BR"] = ltr ? "TL" : "TR";
-					align[ltr ? "BR" : "BL"] = ltr ? "TR" : "TL";
-					break;
-				case "above-alt":
-					ltr = !ltr;
-					// fall through
-				case "above":
-				default:
-					// first try to align left borders, next try to align right borders (or reverse for RTL mode)
-					align[ltr ? "TL" : "TR"] = ltr ? "BL" : "BR";
-					align[ltr ? "TR" : "TL"] = ltr ? "BR" : "BL";
-					break;
-			}
-		});
-		return align;
-	};
-
-	lang.mixin(dijit, exports);
-
-	/*===== return exports; =====*/
-	return dijit;	// for back compat :-(
-});
diff --git a/_base/popup.js b/_base/popup.js
deleted file mode 100644
index 2b0aa204e..000000000
--- a/_base/popup.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define([
-	"dojo/dom-class", // domClass.contains
-	"dojo/_base/window",
-	"../popup",
-	"../BackgroundIframe"	// just loading for back-compat, in case client code is referencing it
-], function(domClass, win, popup){
-
-// module:
-//		dijit/_base/popup
-
-/*=====
-return {
-	// summary:
-	//		Deprecated.   Old module for popups, new code should use dijit/popup directly.
-};
-=====*/
-
-
-// Hack support for old API passing in node instead of a widget (to various methods)
-var origCreateWrapper = popup._createWrapper;
-popup._createWrapper = function(widget){
-	if(!widget.declaredClass){
-		// make fake widget to pass to new API
-		widget = {
-			_popupWrapper: (widget.parentNode && domClass.contains(widget.parentNode, "dijitPopup")) ?
-				widget.parentNode : null,
-			domNode: widget,
-			destroy: function(){},
-			ownerDocument: widget.ownerDocument,
-			ownerDocumentBody: win.body(widget.ownerDocument)
-		};
-	}
-	return origCreateWrapper.call(this, widget);
-};
-
-// Support old format of orient parameter
-var origOpen = popup.open;
-popup.open = function(/*__OpenArgs*/ args){
-	// Convert old hash structure (ex: {"BL": "TL", ...}) of orient to format compatible w/new popup.open() API.
-	// Don't do conversion for:
-	//		- null parameter (that means to use the default positioning)
-	//		- "R" or "L" strings used to indicate positioning for context menus (when there is no around node)
-	//		- new format, ex: ["below", "above"]
-	//		- return value from deprecated dijit.getPopupAroundAlignment() method,
-	//			ex: ["below", "above"]
-	if(args.orient && typeof args.orient != "string" && !("length" in args.orient)){
-		var ary = [];
-		for(var key in args.orient){
-			ary.push({aroundCorner: key, corner: args.orient[key]});
-		}
-		args.orient = ary;
-	}
-
-	return origOpen.call(this, args);
-};
-
-return popup;
-});
diff --git a/_base/scroll.js b/_base/scroll.js
deleted file mode 100644
index 4d9468cf5..000000000
--- a/_base/scroll.js
+++ /dev/null
@@ -1,22 +0,0 @@
-define([
-	"dojo/window", // windowUtils.scrollIntoView
-	"../main"	// export symbol to dijit
-], function(windowUtils, dijit){
-	// module:
-	//		dijit/_base/scroll
-
-	/*=====
-	return {
-		// summary:
-		//		Back compatibility module, new code should use windowUtils directly instead of using this module.
-	};
-	=====*/
-
-	dijit.scrollIntoView = function(/*DomNode*/ node, /*Object?*/ pos){
-		// summary:
-		//		Scroll the passed node into view, if it is not already.
-		//		Deprecated, use `windowUtils.scrollIntoView` instead.
-
-		windowUtils.scrollIntoView(node, pos);
-	};
-});
diff --git a/_base/sniff.js b/_base/sniff.js
deleted file mode 100644
index 2f4e547c8..000000000
--- a/_base/sniff.js
+++ /dev/null
@@ -1,12 +0,0 @@
-define([ "dojo/uacss" ], function(){
-
-	// module:
-	//		dijit/_base/sniff
-
-	/*=====
-	return {
-		// summary:
-		//		Deprecated, back compatibility module, new code should require dojo/uacss directly instead of this module.
-	};
-	=====*/
-});
diff --git a/_base/typematic.js b/_base/typematic.js
deleted file mode 100644
index 3ac8602c3..000000000
--- a/_base/typematic.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define(["../typematic"], function(){
-
-	/*=====
-	return {
-		// summary:
-		//		Deprecated, for back-compat, just loads top level module
-	};
-	=====*/
-
-});
diff --git a/_base/wai.js b/_base/wai.js
deleted file mode 100644
index f139913a9..000000000
--- a/_base/wai.js
+++ /dev/null
@@ -1,109 +0,0 @@
-define([
-	"dojo/dom-attr", // domAttr.attr
-	"dojo/_base/lang", // lang.mixin
-	"../main",	// export symbols to dijit
-	"../hccss"			// not using this module directly, but loading it sets CSS flag on <html>
-], function(domAttr, lang, dijit){
-
-	// module:
-	//		dijit/_base/wai
-
-	var exports = {
-		// summary:
-		//		Deprecated methods for setting/getting wai roles and states.
-		//		New code should call setAttribute()/getAttribute() directly.
-		//
-		//		Also loads hccss to apply dj_a11y class to root node if machine is in high-contrast mode.
-
-		hasWaiRole: function(/*Element*/ elem, /*String?*/ role){
-			// summary:
-			//		Determines if an element has a particular role.
-			// returns:
-			//		True if elem has the specific role attribute and false if not.
-			//		For backwards compatibility if role parameter not provided,
-			//		returns true if has a role
-			var waiRole = this.getWaiRole(elem);
-			return role ? (waiRole.indexOf(role) > -1) : (waiRole.length > 0);
-		},
-
-		getWaiRole: function(/*Element*/ elem){
-			// summary:
-			//		Gets the role for an element (which should be a wai role).
-			// returns:
-			//		The role of elem or an empty string if elem
-			//		does not have a role.
-			 return lang.trim((domAttr.get(elem, "role") || "").replace("wairole:",""));
-		},
-
-		setWaiRole: function(/*Element*/ elem, /*String*/ role){
-			// summary:
-			//		Sets the role on an element.
-			// description:
-			//		Replace existing role attribute with new role.
-
-			domAttr.set(elem, "role", role);
-		},
-
-		removeWaiRole: function(/*Element*/ elem, /*String*/ role){
-			// summary:
-			//		Removes the specified role from an element.
-			//		Removes role attribute if no specific role provided (for backwards compat.)
-
-			var roleValue = domAttr.get(elem, "role");
-			if(!roleValue){ return; }
-			if(role){
-				var t = lang.trim((" " + roleValue + " ").replace(" " + role + " ", " "));
-				domAttr.set(elem, "role", t);
-			}else{
-				elem.removeAttribute("role");
-			}
-		},
-
-		hasWaiState: function(/*Element*/ elem, /*String*/ state){
-			// summary:
-			//		Determines if an element has a given state.
-			// description:
-			//		Checks for an attribute called "aria-"+state.
-			// returns:
-			//		true if elem has a value for the given state and
-			//		false if it does not.
-
-			return elem.hasAttribute ? elem.hasAttribute("aria-"+state) : !!elem.getAttribute("aria-"+state);
-		},
-
-		getWaiState: function(/*Element*/ elem, /*String*/ state){
-			// summary:
-			//		Gets the value of a state on an element.
-			// description:
-			//		Checks for an attribute called "aria-"+state.
-			// returns:
-			//		The value of the requested state on elem
-			//		or an empty string if elem has no value for state.
-
-			return elem.getAttribute("aria-"+state) || "";
-		},
-
-		setWaiState: function(/*Element*/ elem, /*String*/ state, /*String*/ value){
-			// summary:
-			//		Sets a state on an element.
-			// description:
-			//		Sets an attribute called "aria-"+state.
-
-			elem.setAttribute("aria-"+state, value);
-		},
-
-		removeWaiState: function(/*Element*/ elem, /*String*/ state){
-			// summary:
-			//		Removes a state from an element.
-			// description:
-			//		Sets an attribute called "aria-"+state.
-
-			elem.removeAttribute("aria-"+state);
-		}
-	};
-
-	lang.mixin(dijit, exports);
-
-	/*===== return exports; =====*/
-	return dijit;	// for back compat :-(
-});
diff --git a/_base/window.js b/_base/window.js
deleted file mode 100644
index ba3f80203..000000000
--- a/_base/window.js
+++ /dev/null
@@ -1,18 +0,0 @@
-define([
-	"dojo/window", // windowUtils.get
-	"../main"	// export symbol to dijit
-], function(windowUtils, dijit){
-	// module:
-	//		dijit/_base/window
-
-	/*=====
-	return {
-		// summary:
-		//		Back compatibility module, new code should use windowUtils directly instead of using this module.
-	};
-	=====*/
-
-	dijit.getDocumentWindow = function(doc){
-		return windowUtils.get(doc);
-	};
-});
diff --git a/focus.js b/focus.js
index 016c860b4..21a21c77a 100644
--- a/focus.js
+++ b/focus.js
@@ -13,10 +13,9 @@ define([
 	"dojo/_base/window", // win.body
 	"dojo/window", // winUtils.get
 	"./a11y",	// a11y.isTabNavigable
-	"./registry",	// registry.byId
-	"./main"		// to set dijit.focus
+	"./registry"	// registry.byId
 ], function(aspect, declare, dom, domAttr, domConstruct, Evented, lang, on, domReady, has, Stateful, win, winUtils,
-			a11y, registry, dijit){
+			a11y, registry){
 
 	// module:
 	//		dijit/focus
@@ -325,28 +324,6 @@ define([
 	// register top window and all the iframes it contains
 	domReady(function(){
 		var handle = singleton.registerWin(winUtils.get(document));
-		if(has("ie")){
-			on(window, "unload", function(){
-				if(handle){	// because this gets called twice when doh.robot is running
-					handle.remove();
-					handle = null;
-				}
-			});
-		}
-	});
-
-	// Setup dijit.focus as a pointer to the singleton but also (for backwards compatibility)
-	// as a function to set focus.   Remove for 2.0.
-	dijit.focus = function(node){
-		singleton.focus(node);	// indirection here allows dijit/_base/focus.js to override behavior
-	};
-	for(var attr in singleton){
-		if(!/^_/.test(attr)){
-			dijit.focus[attr] = typeof singleton[attr] == "function" ? lang.hitch(singleton, attr) : singleton[attr];
-		}
-	}
-	singleton.watch(function(attr, oldVal, newVal){
-		dijit.focus[attr] = newVal;
 	});
 
 	return singleton;
diff --git a/place.js b/place.js
index 291cfc8d0..bb719833d 100644
--- a/place.js
+++ b/place.js
@@ -371,10 +371,6 @@ define([
 						push(ltr ? "TL" : "TR", ltr ? "BL" : "BR");
 						push(ltr ? "TR" : "TL", ltr ? "BR" : "BL");
 						break;
-					default:
-						// To assist dijit/_base/place, accept arguments of type {aroundCorner: "BL", corner: "TL"}.
-						// Not meant to be used directly.  Remove for 2.0.
-						push(pos.aroundCorner, pos.corner);
 				}
 			});
 
diff --git a/tests/_base/manager.html b/tests/_base/manager.html
deleted file mode 100644
index 447761417..000000000
--- a/tests/_base/manager.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-	Remove in 2.0.   Replaced by dijit/tests/registry.html
--->
-
-<html>
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<title>Dijit manager unit test</title>
-	<style type="text/css">
-		@import "../../themes/claro/document.css";
-		@import "../css/dijitTests.css";
-	</style>
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript" src="../_testCommon.js"></script>
-
-	<script type="text/javascript">
-		dojo.require("doh.runner");
-		dojo.require("dojo.parser");
-		dojo.require("dijit.dijit");
-
-		dojo.ready(function(){
-			dojo.declare("foo", dijit._Widget, {
-				name: "",
-				attr1: 0,
-				attr2: 0
-			});
-	
-			dojo.declare("bar", dijit._Widget, {
-				name: "",
-				attr1: 0,
-				attr2: 0
-			});
-	
-			dojo.declare("Baz", dijit._Widget, {
-				name: "",
-				attr1: 1,
-				attr2: 1
-			});
-
-			doh.register("parse", function(){
-				dojo.parser.parse();
-			});
-
-			doh.register("dijit._base.manager",
-				[
-					function forEachTest(t){
-						var names=[];
-						dijit.registry.forEach(function(widget){ names.push(widget.name); });
-						t.is(names.join(" "), "bob is your uncle");
-					},
-					function filterTest(t){
-						var names=[];
-						dijit.registry.
-							filter(function(widget){ return widget.attr1==10; }).
-							forEach(function(widget){ names.push(widget.name); });
-						t.is(names.join(" "), "bob uncle");
-					},
-					function filterScope(t){
-						// testing filter with a forced 'this' in the cb function
-						var names = [],
-							obj = {
-								check: function(widget, val){
-									// same as previous unit test
-									return widget.attr1 == val;
-								}
-							};
-						dijit.registry
-							.filter(function(w){ return this.check(w, 10); }, obj)
-							.forEach(function(w){ names.push(w.name) })
-						;
-						t.is(names.join(" "), "bob uncle");
-					},
-					function byId(t){
-						t.is(dijit.byId("three").name, "your");
-						t.f(dijit.byId("nonexistant"));
-					},
-					function byClass(t){
-						var names=[];
-						dijit.registry.
-							byClass("bar").
-							forEach(function(widget){ names.push(widget.name); });
-						t.is(names.join(" "), "your uncle");
-					},
-					function lengthTest(t){
-						// test existing length
-						t.is(dijit.registry.byClass("bar").length, 2);
-						// test adding:
-						var n = new Baz();
-						t.is(dijit.registry.byClass("Baz").length, 1);
-						// test destroying:
-						n.destroy();
-						t.is(dijit.registry.byClass("Baz").length, 0);
-					},
-					function nullLengthTest(t){
-						var ws = new dijit.WidgetSet();
-						var count = 0;
-
-						var b = [new Baz(), new Baz()];
-						ws.add(b[0]);
-						ws.add(b[1]);
-
-						t.is(2, ws.length);
-
-						ws.remove(b[0].id);
-						t.is(1, ws.length);
-
-						ws.remove(b[1].id);
-						t.is(0, ws.length);
-
-						// ensure we don't ever go below 0
-						ws.remove("invalidId");
-						t.is(0, ws.length);
-
-						dojo.forEach(b, function(w){ w.destroy() });
-
-					},
-					function forEachScope(t){
-						var obj = {
-							getIt: function(widget){
-								return widget.id;
-							}
-						};
-
-						dijit.registry.forEach(function(w){
-							t.is(w.id, this.getIt(w));
-						}, obj);
-					},
-					function forEachReturn(t){
-						// also tests WidgetSet.map
-						var ws = dijit.registry.forEach(function(){}).map(function(w){
-							return w.declaredClass.toUpperCase();
-						});
-						t.t(dojo.isArray(ws));
-						t.is(ws.length, dijit.registry.length);
-					},
-					function forEachInc(t){
-						var x = 0;
-						dijit.registry.forEach(function(w, i){
-							t.is(i, x++);
-						});
-					},
-					function toArrayTest(t){
-						var ws = dijit.registry.byClass("bar");
-						var wa = ws.toArray();
-
-						t.t(dojo.isArray(wa));
-						t.is(ws.length, wa.length);
-
-						var wda = dojo.map(wa, function(w){
-							return w.domNode;
-						});
-
-						t.is(wda.length, ws.length);
-						var wdas = wda.slice(-1);
-
-						t.is(1, wdas.length);
-
-						var w = dijit.byNode(wdas[0]);
-						t.is(w.declaredClass, "bar");
-					},
-					function mapTest(t){
-						var ids = dijit.registry.map(function(w){
-							return w.id;
-						});
-						t.is(ids.length, dijit.registry.length);
-						dijit.registry.forEach(function(id){
-							t.t(dijit.byId(id));
-						});
-					},
-					function everyTest(t){
-
-						var a = new Baz();
-						var b = new Baz();
-
-						var hasid = dijit.registry.every(function(w){
-							return w.id;
-						});
-
-						t.t(hasid);
-
-						var hasattr1 = dijit.registry.every(function(w){
-							return w.attr1 > 0;
-						});
-
-						t.t(hasattr1);
-
-						var x = 0;
-						var once = dijit.registry.every(function(w){
-							x++;
-							return false;
-						});
-						t.is(1, x);
-						t.f(once);
-
-						a.destroy();
-						b.destroy();
-
-					},
-					function someTest(t){
-
-						var a = new Baz();
-						var b = new Baz();
-
-						var x = 0;
-						var hasid = dijit.registry.some(function(w){
-							x++;
-							return w.id;
-						});
-
-						t.is(1, x);
-						t.t(hasid);
-
-						var n = 0;
-						var hasattr1 = dijit.registry.some(function(w){
-							n++;
-							return false;
-						});
-						t.is(n, dijit.registry.length);
-						t.f(hasattr1);
-
-						var l = 0;
-						var once = dijit.registry.some(function(w){
-							l++;
-							return true;
-						});
-						t.is(1, l);
-						t.t(once);
-
-						a.destroy();
-						b.destroy();
-
-					},
-					function deleteTest(t){
-						var names=[];
-						dijit.byId("two").destroy();
-						dijit.byId("four").destroy();
-						dijit.registry.forEach(function(widget){ names.push(widget.name); });
-						t.is(names.join(" "), "bob your");
-					},
-					function getEnclosingWidgetTest(t){
-						t.is(dijit.getEnclosingWidget(dojo.byId("not-a-widget")), null);
-						t.is(dijit.getEnclosingWidget(dojo.byId("three")).name, "your");
-						t.is(dijit.getEnclosingWidget(dojo.byId("three.one")).name, "your");
-						t.is(dijit.getEnclosingWidget(dojo.byId("three.one.one")).name, "your");
-					}
-				]
-			);
-
-			doh.run();
-		});
-
-	</script>
-</head>
-<body>
-	<h1>Dijit Manager Unit Test</h1>
-	<div id="one" data-dojo-type="foo" data-dojo-props='name:"bob", attr1:10, attr2:10'></div>
-	<div id="two" data-dojo-type="foo" data-dojo-props='name:"is", attr1:5, attr2:10'></div>
-	<div id="three" data-dojo-type="bar" data-dojo-props='name:"your", attr1:5, attr2:5'>
-		<div id="three.one">
-			<div id="three.one.one"></div>
-		</div>
-	</div>
-	<div id="four" data-dojo-type="bar" data-dojo-props='name:"uncle", attr1:10, attr2:5'></div>
-	<div id="not-a-widget"></div>
-</body>
-</html>
diff --git a/tests/_base/module.js b/tests/_base/module.js
deleted file mode 100644
index d8a0fd345..000000000
--- a/tests/_base/module.js
+++ /dev/null
@@ -1,15 +0,0 @@
-define(["doh/main", "require"], function(doh, require){
-
-	var test_robot = true;
-
-	doh.register("_base.manager", require.toUrl("./manager.html"), 999999);
-	doh.register("_base.wai", require.toUrl("./wai.html"), 999999);
-	doh.register("_base.place", require.toUrl("./place.html"), 999999);
-	doh.register("_base.popup", require.toUrl("./popup.html"), 999999);
-	if(test_robot){
-		doh.register("_base.robot.CrossWindow", require.toUrl("./robot/CrossWindow.html"), 999999);
-		doh.register("_base.robot.FocusManager", require.toUrl("./robot/FocusManager.html"), 999999);
-		doh.register("_base.robot.focus_mouse", require.toUrl("./robot/focus_mouse.html"), 999999);
-	}
-
-});
diff --git a/tests/_base/multiversion.html b/tests/_base/multiversion.html
deleted file mode 100644
index ca5d7a94d..000000000
--- a/tests/_base/multiversion.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-	<!--
-		Tests that generated widget id's are unique according to scopeMap.
-		The created widgets should get the non-conflicting generated names 
-			- dijit1_dijit_layout_ContentPane_0
-			- dijit2_dijit_layout_ContentPane_0
-
-		Before running this tests, Dojo XD must be built via:
-			$ cd util/buildscripts
-			$ ./build.sh action=release loader=xdomain profile=standard optimize=comments
-	-->
-	<title>Multi-version test</title>
-	<script type="text/javascript">
-		djConfig = {
-			baseUrl:'../../../release/dojo/dojo/',
-			scopeMap:[
-				['dojo','dojo1'],
-				['dijit','dijit1'],
-				['dojox','dojox1']
-			],
-			afterOnLoad: true
-		};
-	</script>
-	<script type="text/javascript" src="../../../release/dojo/dojo/dojo.xd.js"></script>
-	<script type="text/javascript">
-		dojo1.require("dijit.layout.ContentPane");
-		var cp1, cp2;
-		dojo1.ready(function(){
-			cp1 = new dijit1.layout.ContentPane({ content: 'one' });
-			cp1.placeAt(dojo1.body());
-			cp1.startup();
-
-			var sc = dojo1.doc.createElement('script');
-			sc.type = 'text/javascript';
-			djConfig = {
-				baseUrl:'../../../release/dojo/dojo/',
-				scopeMap:[
-					['dojo','dojo2'],
-					['dijit','dijit2'],
-					['dojox','dojox2']
-				],
-				afterOnLoad: true
-			};
-			sc.src = '../../../release/dojo/dojo/dojo.xd.js';
-			function onScriptLoad(){
-				dojo2.require("dijit.layout.ContentPane");
-				dojo2.ready(function(){
-					cp2 = new dijit2.layout.ContentPane({ content: 'two' });
-					cp2.placeAt(dojo2.body());
-					cp2.startup();
-
-					var widgets1 = dijit1.findWidgets(dojo1.body());
-					var widgets2 = dijit2.findWidgets(dojo2.body());
-
-					dojo1.query('[widgetId='+cp1.id+']').forEach(function(n){
-						var w = dijit1.byNode(n);
-						if(w.domNode === n){
-							console.log(w + ' matches');
-						}else{
-							console.log(w + ' doesn\'t match');
-						}
-					});
-					dojo2.query('[widgetId='+cp2.id+']').forEach(function(n){
-						var w = dijit2.byNode(n);
-						if(w.domNode === n){
-							console.log(w + ' matches');
-						}else{
-							console.log(w + ' doesn\'t match');
-						}
-					});
-				});
-			}
-			if(typeof sc['addEventListener'] != 'undefined'){
-				sc.addEventListener('load', onScriptLoad, false);
-			}else{
-				sc.attachEvent('onreadystatechange', onScriptLoad);
-			}
-			dojo1.doc.getElementsByTagName('head')[0].appendChild(sc);
-		});
-	</script>
-</head>
-<body>
-</body>
-</html>
diff --git a/tests/_base/place.html b/tests/_base/place.html
deleted file mode 100644
index a8933019a..000000000
--- a/tests/_base/place.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-
-<!--
-    Test case for dijit/_base/place.
-    Remove in 2.0 in favor of dijit/tests/place.html
--->
-
-<html>
-<head>
-	<title>dijit/_base/place unit test</title>
-	<style type="text/css">
-		@import "../../themes/claro/document.css";
-		@import "../css/dijitTests.css";
-
-		html {
-			overflow: hidden; /* ie6 needs this */
-		}
-		body {
-			height: 100%;
-			padding: 0;
-			margin: 0;
-			border: 0;
-		}
-
-		.aroundNode {
-			position: absolute;
-			width: 20px;
-			height: 20px;
-			background: yellow;
-		}
-
-		#popup {
-			position: absolute;
-			width: 75px;
-			background: blue;
-			color: white;
-		}
-	</style>
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true, parseOnLoad: false"></script>
-	<script type="text/javascript" src="../_testCommon.js"></script>
-
-	<script type="text/javascript">
-		dojo.require("doh.runner");
-		dojo.require("dojo.window");
-		dojo.require("dijit.dijit");
-
-
-		dojo.ready(function(){
-
-			// The around nodes
-			var aroundTop = dojo.byId("aroundTop"),
-				aroundBottom = dojo.byId("aroundBottom"),
-				aroundLeft = dojo.byId("aroundLeft"),
-				aroundRight = dojo.byId("aroundRight");
-
-			// The popup (aka dropdown)
-			var popup = dojo.byId("popup");
-
-			doh.register("dijit/_base/place",
-				[
-					function placeOnScreenTL(t){
-						// Place popup at (10,7)... dijit.placeOnScreen() should choose the top-left corner, because
-						// any of the other corner would make the popup go partially off the screen
-						var ret = dijit.placeOnScreen(popup, {x: 10, y:7}, ["TR", "BR", "BL", "TL"]);
-
-						doh.is("TL", ret.corner, "top left corner chosen");
-						doh.is("10px", popup.style.left, "x coord");
-						doh.is("7px", popup.style.top, "y coord");
-						doh.is(75, ret.w, "it's 75px wide");
-					},
-					function placeOnScreenTR(t){
-						// Place popup at top right... dijit.placeOnScreen() should choose the top-right corner, because
-						// any of the other corner would make the popup go partially off the screen
-						var viewport = dojo.window.getBox(),
-							ret = dijit.placeOnScreen(popup, {x: viewport.w-10, y:7}, ["TL", "BR", "TR", "BL"]),
-							popupCoords = dojo.position(popup);
-
-						doh.is("TR", ret.corner, "top left corner chosen");
-						doh.is(viewport.w-10, popupCoords.x + popupCoords.w, "x coord");
-						doh.is("7px", popup.style.top, "y coord");
-						doh.is(75, ret.w, "it's 75px wide");
-					},
-					function placeOnScreenAroundNodeT(t){
-						// Dropdown from "aroundTop" node. Should pick the second choice, since the first
-						// goes offscreen.
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
-							"TL": "BL",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
-							"BL": "TL",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
-							"BR": "TR"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
-						});
-
-						doh.is("BL", ret.aroundCorner, "around corner");
-						doh.is("TL", ret.corner, "popup's corner");
-						doh.is("20px", popup.style.top, "underneath around node");
-						doh.is(Math.round(dojo.position(aroundTop).x), Math.round(popup.style.left.replace("px", "")),
-								"left sides aligned");
-					},
-					function placeOnScreenAroundNodeTooltip(t){
-						// Same as above test except that shape of drop down changes depending on where it's positioned.
-						// Simulates tooltip placement (tooltip shape changes b/c of the arrow).
-						// Should pick the third choice this time
-
-						function layoutNode(node, aroundCorner, nodeCorner){
-							node.style.width = (nodeCorner == "TL" ? "5000px" : "75px");
-						}
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
-							"TL": "BL",	// aroundTop's top-left corner with the popup's bottom-left corner (fails)
-							"BL": "TL",	// aroundTop's bottom-left corner with the popup's top-left corner (works)
-							"BR": "TR"	// aroundTop's bottom-right corner with the popup's top-right corner (works)
-						}, layoutNode);
-
-						doh.is("BR", ret.aroundCorner, "around corner");
-						doh.is("TR", ret.corner, "popup's corner");
-						doh.is("20px", popup.style.top, "underneath around node");
-						doh.is(Math.round(dojo.position(aroundTop).x + dojo.position(aroundTop).w),
-							Math.round(dojo.position(popup).x + dojo.position(popup).w),
-							"right sides aligned");
-					},
-					function placeOnScreenAroundNodeB(t){
-						// Dropdown from "aroundBottom" node. Should go above aroundNode so that
-						// popup doesn't go offscreen
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
-							"BL": "TL",	// aroundBottom's bottom-left corner with the popup's top-left corner (fails)
-							"TL": "BL",	// aroundBottom's top-left corner with the popup's bottom-left corner (works)
-							"BR": "TR"	// aroundBottom's bottom-right corner with the popup's top-right corner (fails)
-						});
-
-						doh.is("TL", ret.aroundCorner, "around corner");
-						doh.is("BL", ret.corner, "popup's corner");
-						doh.is(Math.round(dojo.position(aroundBottom).y),
-								Math.round(dojo.position(popup).y + dojo.position(popup).h), "above around node");
-					},
-					function placeOnScreenAroundNodeBM(t){
-						// bottom middle popup from "aroundBottom" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
-							"TR": "TL",	// aroundBottom's top-right corner with the popup's top-left corner (fails)
-							"TM": "BM",	// aroundBottom's top-middle with the popup's bottom-middle (works)
-							"BM": "TM",	// aroundBottom's bottom-middle with the popup's top-middle (fails)
-							"TL": "TR"	// aroundBottom's top-left corner with the popup's top-right corner (fails)
-						});
-
-						doh.is("TM", ret.aroundCorner, "around middle");
-						doh.is("BM", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundBottom);
-						doh.is(Math.round(aroundPos.y), Math.round(popupPos.y + popupPos.h), "above around node");
-						doh.t(aroundPos.x > popupPos.x, "starts before around node");
-						doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
-					},
-					function placeOnScreenAroundNodeTM(t){
-						// top middle popup from "aroundTop" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
-							"BL": "BR",	// aroundTop's bottom-left corner with the popup's bottom-right corner (fails)
-							"TM": "BM",	// aroundTop's top-middle with the popup's bottom-middle (fails)
-							"BM": "TM",	// aroundTop's bottom-middle with the popup's top-middle (works)
-							"BR": "BL"	// aroundTop's bottom-right corner with the popup's bottom-left corner (fails)
-						});
-
-						doh.is("BM", ret.aroundCorner, "around middle");
-						doh.is("TM", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundTop);
-						doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
-						doh.t(aroundPos.x > popupPos.x, "starts before around node");
-						doh.t(aroundPos.x < (popupPos.x + popupPos.w), "ends after around node");
-					},
-					function placeOnScreenAroundNodeML(t){
-						// middle left popup from "aroundLeft" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundLeft, {
-							"BR": "TR",	// aroundLeft's bottom-right corner with the popup's top-right corner (fails)
-							"MR": "ML",	// aroundLeft's middle-right with the popup's middle-left (works)
-							"ML": "MR",	// aroundLeft's middle-left with the popup's middle-right (fails)
-							"TR": "BR"	// aroundLeft's top-right corner with the popup's bottom-right corner (fails)
-						});
-
-						doh.is("MR", ret.aroundCorner, "around middle");
-						doh.is("ML", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundLeft);
-						doh.is(aroundPos.x + aroundPos.w, popupPos.x, "after around node");
-						doh.t(aroundPos.y > popupPos.y, "starts before around node");
-						doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
-					},
-					function placeOnScreenAroundNodeMR(t){
-						// middle left popup from "aroundRight" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundRight, {
-							"BL": "TL",	// aroundRight's bottom-left corner with the popup's top-left corner (fails)
-							"MR": "ML",	// aroundRight's middle-right with the popup's middle-left (fails)
-							"ML": "MR",	// aroundRight's middle-left with the popup's middle-right (works)
-							"TL": "BL"	// aroundRight's top-left corner with the popup's bottom-left corner (fails)
-						});
-
-						doh.is("ML", ret.aroundCorner, "around middle");
-						doh.is("MR", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundRight);
-						doh.is(Math.round(popupPos.x + popupPos.w), Math.round(aroundPos.x), "before around node");
-						doh.t(aroundPos.y > popupPos.y, "starts before around node");
-						doh.t(aroundPos.y < (popupPos.y + popupPos.h), "ends after around node");
-					},
-					function placeOnScreenAroundNodeMLB(t){
-						// bottom middle popup from "aroundLeft" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundLeft, {
-							"BR": "TR",	// aroundLeft's bottom-right corner with the popup's top-right corner (fails)
-							"BM": "TM",	// aroundLeft's bottom-middle with the popup's top-middle (works, sort of)
-							"TR": "BR"	// aroundLeft's top-right corner with the popup's bottom-right corner (fails)
-						});
-
-						doh.is("BM", ret.aroundCorner, "around middle");
-						doh.is("TM", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundLeft);
-						doh.is(Math.round(aroundPos.y + aroundPos.h), Math.round(popupPos.y), "below around node");
-						doh.is(aroundPos.x, popupPos.x, "left aligned with around node");
-					},
-					function placeOnScreenAroundNodeMRT(t){
-						// top middle popup from "aroundRight" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundRight, {
-							"BL": "TL",	// aroundRight's bottom-left corner with the popup's top-left corner (fails)
-							"TM": "BM",	// aroundRight's top-middle with the popup's bottom-middle (works)
-							"TL": "BL"	// aroundRight's top-left corner with the popup's bottom-left corner (fails)
-						});
-
-						doh.is("TM", ret.aroundCorner, "around middle");
-						doh.is("BM", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundRight);
-						doh.is(Math.round(popupPos.x + popupPos.w),
-								Math.round(aroundPos.x + aroundPos.w + 1/*right:1px*/), "right aligned with around node");
-						doh.is(Math.round(popupPos.y + popupPos.h), Math.round(aroundPos.y), "above around node");
-					},
-					function placeOnScreenAroundNodeTML(t){
-						// middle left popup from "aroundTop" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundTop, {
-							"BL": "BR",	// aroundTop's bottom-left corner with the popup's bottom-right corner (fails)
-							"ML": "MR",	// aroundTop's middle-left with the popup's middle-right (works)
-							"BR": "BL"	// aroundTop's bottom-right corner with the popup's bottom-left corner (fails)
-						});
-
-						doh.is("ML", ret.aroundCorner, "around middle");
-						doh.is("MR", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundTop);
-						doh.is(Math.round(aroundPos.x), Math.round(popupPos.x + popupPos.w), "before around node");
-						doh.is(aroundPos.y, popupPos.y, "top aligned with around node");
-					},
-					function placeOnScreenAroundNodeBMR(t){
-						// middle right popup from "aroundBottom" node
-						var ret = dijit.placeOnScreenAroundNode(popup, aroundBottom, {
-							"TL": "TR",	// aroundBottom's top-left corner with the popup's top-right corner (fails)
-							"MR": "ML",	// aroundBottom's middle-right with the popup's middle-left (works)
-							"TR": "TL"	// aroundBottom's top-right corner with the popup's top-left corner (fails)
-						});
-
-						doh.is("MR", ret.aroundCorner, "around middle");
-						doh.is("ML", ret.corner, "popup's middle");
-						var popupPos = dojo.position(popup);
-						var aroundPos = dojo.position(aroundBottom);
-						doh.is(Math.round(aroundPos.x + aroundPos.w), Math.round(popupPos.x), "after around node");
-						doh.is(Math.round(aroundPos.y + aroundPos.h + 5/*bottom:5px*/),
-								Math.round(popupPos.y + popupPos.h), "bottom aligned with around node");
-					}
-				]
-			);
-			doh.run();
-		});
-
-	</script>
-</head>
-<body>
-	<h1>Dijit/_base/place Unit Test</h1>
-	<div id="aroundTop" class="aroundNode" style="top: 0; left: 50%;">T</div>
-	<div id="aroundLeft" class="aroundNode" style="bottom: 30%; left: 0;">L</div>
-	<div id="aroundRight" class="aroundNode" style="bottom: 30%; right: 1px;">R</div>
-	<div id="aroundBottom" class="aroundNode" style="bottom: 5px; left: 50%;">B</div>
-
-	<div id="popup">
-		I'm a drop down, wider and taller than the around nodes I'm placed next to.
-	</div>
-</body>
-</html>
diff --git a/tests/_base/popup.html b/tests/_base/popup.html
deleted file mode 100644
index 13a61e398..000000000
--- a/tests/_base/popup.html
+++ /dev/null
@@ -1,472 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-
-<!--
-	Tests the old dijit/_base/popup API.
-	Remove in 2.0.   Replaced by dijit/tests/popup.html.
--->
-
-<html>
-<head>
-	<title>Dijit.popup and BackgroundIFrame unit test</title>
-	<style type="text/css">
-		@import "../../themes/claro/document.css";
-		@import "../../themes/dijit.css";
-		@import "../css/dijitTests.css";
-
-		body {
-			height: 100%;
-			padding: 0;
-			margin: 0;
-		}
-
-		div {
-			background: white;
-			border: solid 1px gray;
-		}
-
-		/* the menu type test widgets */
-		.choice div {
-			width: 200px;
-			cursor: pointer;
-		}
-		.choice div:hover {
-			background: #ccc;
-		}
-	</style>
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true, parseOnLoad: false"></script>
-	<script type="text/javascript" src="../_testCommon.js"></script>
-
-	<script type="text/javascript">
-		dojo.require("doh.runner");
-		dojo.require("dijit._base.popup");
-		dojo.require("dijit._Widget");
-		dojo.require("dijit._TemplatedMixin");
-		dojo.require("dijit.tests.helpers");	// functions to help test
-
-		function log(str){
-			console.log(str);
-		}
-
-		dojo.ready(function(){
-
-			dojo.declare("SimpleDropDownButton", [dijit._Widget, dijit._TemplatedMixin], {
-				// summary:
-				//		A button that shows a popup.
-				//		Supply popup as parameter when instantiating this widget.
-
-				label: "show popup",
-				orient: {'BL': 'TL', 'BR': 'TR'},
-
-				templateString: "<button data-dojo-attach-event='onclick: openPopup'>${label}</button>",
-
-				openPopup: function(){
-					var self = this;
-
-					dijit.popup.open({
-						popup: this.popup,
-						parent: this,
-						around: this.domNode,
-						orient: this.orient,
-						onCancel: function(){
-							log(self.id + ": cancel of child");
-						},
-						onExecute: function(){
-							log(self.id + ": execute of child");
-							dijit.popup.close(self.popup);
-							self.open = false;
-						}
-					});
-
-					this.open = true;
-				},
-
-				closePopup: function(){
-					if(this.open){
-						log(this.id + ": close popup due to blur");
-						dijit.popup.close(this.popup);
-						this.open = false;
-					}
-				},
-
-				_onBlur: function(){
-					// summary:
-					//		This is called from focus manager and when we get the signal we
-					//		need to close the drop down
-					this.closePopup();
-				}
-			});
-
-			dojo.declare("SimplePopup",  [dijit._Widget, dijit._TemplatedMixin], {
-				// summary:
-				//		A trivial popup widget
-
-				templateString: "<span>i'm a popup</span>"
-			});
-
-			dojo.declare("SimpleChoiceWidget",  [dijit._Widget, dijit._TemplatedMixin], {
-				// summary:
-				//		A list of values; select a value by pressing an entry in the list.
-
-				choice1: "1",
-				choice2: "2",
-				choice3: "3",
-
-				templateString:
-					"<div class='choice'>" +
-						"<div data-dojo-attach-event='onclick: onClick'>${choice1}</div>" +
-						"<div data-dojo-attach-event='onclick: onClick'>${choice2}</div>" +
-						"<div data-dojo-attach-event='onclick: onClick'>${choice3}</div>" +
-					"</div>",
-
-				onClick: function(e){
-					this.onChange(e.target.innerHTML);
-				},
-
-				onChange: function(val){
-					// summary:
-					//		When this widget is used as a popup, dijit.popup monitors calls
-					//		to onChange and then closes the popup
-					log(this.id + ": selected " + val);
-				}
-			});
-
-			// Create a button that displays a simple drop down
-			choiceDropDown = new SimpleChoiceWidget();
-			(choiceDropDownButton = new SimpleDropDownButton({
-				id: "choiceDropDownButton",
-				label: "show choice drop down",
-				popup: choiceDropDown
-			})).placeAt(dojo.byId("widgets"));
-
-			dojo.declare("DialogWithPopupWidget",  [dijit._Widget, dijit._TemplatedMixin], {
-				// summary:
-				//		This is a dialog that contains a button that spawns a drop down.
-				//		Supply popup as an argument to this widget.
-
-				title: "I'm a dialog",
-				label: "click me",
-
-				templateString:
-					"<div style='width: 300px'>" +
-						"<div>${title}</div>" +
-						"<input><br>" +
-						"<button data-dojo-attach-point='button'>${label}</button><br>" +
-						"<button data-dojo-attach-event='onclick: onExecute'>OK</button>" +
-					"</div>",
-
-				postCreate: function(){
-					// Convert the plain button into a SimpleDropDownButton widget.
-					// Having it be a widget is important because that's how the popup
-					// code knows where a stack of nested popups (typically menus) ends.
-					// (In this case closing a stack of menus shouldn't close the dialog.)
-
-					new SimpleDropDownButton({
-						id: this.id + "PopupButton",
-						label: this.label,
-						popup: this.popup,
-						orient: {'BR': 'BL', 'TR': 'tL'}	// so popup doesn't cover OK button
-					}, this.button);
-				},
-
-				onExecute: function(){
-					// summary:
-					//		Called when OK button is pressed.
-					//		If this is used as a popup this signals to the parent that
-					//		Dialog can be closed.
-					console.log(this.id + ": executed");
-				}
-			});
-
-			// Create a button that displays a dialog that displays a choice widget
-			dialogDropDownButton = new SimpleDropDownButton({
-				id: "showSimpleDialogButton",
-				label: "show dialog",
-				popup: new DialogWithPopupWidget({
-					id: "simpleDialog",
-					label: 'show simple choice drop down',
-					popup: new SimpleChoiceWidget({
-						id: "choiceFromDialog"
-					})
-				})
-			}).placeAt(dojo.byId("widgets"));
-
-			dojo.declare("NestedPopupOpener",  [dijit._Widget, dijit._TemplatedMixin], {
-				// summary:
-				//		Clicking a value in this list will open a nested popup.
-				//		Specify popup1 and popup2 as parameters to this widget.
-
-				templateString:
-					"<div class='choice'>" +
-						"<div data-dojo-attach-event='onclick: onClick'>popup1</div>" +
-						"<div data-dojo-attach-event='onclick: onClick'>popup2</div>" +
-					"</div>",
-
-				onClick: function(e){
-					var id = this.id,
-						popup = this[e.target.innerHTML];
-					log(id + ": opening popup " + popup.id);
-					this.openPopup(popup);
-				},
-
-				openPopup: function(popup){
-					dijit.popup.open({
-						popup: popup,
-						parent: this,
-						around: this.domNode,
-						orient: {'TR': 'TL', 'TL': 'TR'},
-						onCancel: function(){
-							log(id + ": cancel of child " + popup.id);
-						},
-						onExecute: function(){
-							log(id + ": execute of child " + popup.id);
-							dijit.popup.close(popup);
-						}
-					})
-				},
-
-				closePopup: function(popup){
-					dijit.popup.close(popup);
-				}
-			});
-
-			// Create a button that displays a nested drop down.
-			nestedOpener = new NestedPopupOpener({
-				id: 'nestedPopupOpener',
-				popup1: (nestedChoice1 = new SimpleChoiceWidget({
-					id: "nestedChoice1"
-				})),
-				popup2: (nestedChoice2 = new SimpleChoiceWidget({
-					id: "nestedChoice2",
-					choice1: "4",
-					choice2: "5",
-					choice3: "6"
-				}))
-			});
-			nestedDropDownButton = new SimpleDropDownButton({
-				id: "showNestedMenuButton",
-				label: "show nested drop down",
-				popup: nestedOpener
-			}).placeAt(dojo.byId("widgets"));
-
-			// Create a button that displays a dialog that displays a nested drop down
-			dialogNestedChoice1 = new SimpleChoiceWidget({
-				id: "dialogNestedChoice1"
-			});
-			dialogNestedChoice2 = new SimpleChoiceWidget({
-				id: "dialogNestedChoice2",
-				choice1: "4",
-				choice2: "5",
-				choice3: "6"
-			});
-			dialogNestedPopupOpener = new NestedPopupOpener({
-				id: "nestedPopupOpenerFromDialog",
-				popup1: dialogNestedChoice1,
-				popup2: dialogNestedChoice2
-			});
-			dialogWithNestedPopup = new DialogWithPopupWidget({
-				id: "buttonInComplexDialog",
-				label: 'show nested menu',
-				popup: dialogNestedPopupOpener
-			});
-			dialogDropDownButton = new SimpleDropDownButton({
-				id: "showComplexDialogButton",
-				label: "show dialog w/nested menu",
-				popup: dialogWithNestedPopup
-			}).placeAt(dojo.byId("widgets"));
-
-			// For testing, create an unattached widget and unattached DOMNode
-			new SimplePopup({id: "spw"}).placeAt(dojo.body());
-			dojo.place("<span id='sdn'>simple dom node</span>", dojo.body());
-
-			doh.register("API", [
-					function repeatMoveOffScreen(){
-						// Previously, calling moveOffScreen twice would cause an exception
-						dijit.popup.moveOffScreen(dijit.byId("spw"));
-						dijit.popup.moveOffScreen(dijit.byId("spw"));
-
-						// Deprecated API where moveOffScreen() takes a DOMNode
-						dijit.popup.moveOffScreen(dojo.byId("sdn"));
-						dijit.popup.moveOffScreen(dojo.byId("sdn"));
-					}
-			]);
-
-			doh.register("simple open and close", [
-				function initialConditions(t){
-					// If the popup code has cached any iframes, make sure they are hidden
-					dojo.query("iframe").forEach(function(node){
-						console.log("found iframe", node);
-						doh.is("none", node.style.display, "background iframe is hidden");
-					});
-				},
-
-				// Create popup on the edge of another widget
-				function openAround(){
-					var d = new doh.Deferred();
-
-					var around = dojo.global.choiceDropDownButton,
-						popup = dojo.global.choiceDropDown;
-
-					around.openPopup();
-
-					setTimeout(d.getTestCallback(function(){
-						doh.t(isVisible(popup.domNode), "popup is visible");
-
-						if(dojo.isIE <= 6){
-							// Test the BackgroundIFrame
-							var iframes = dojo.query("iframe");
-							doh.is(1, iframes.length, "one background iframe on IE6");
-
-							var popupCoords = dojo.position(popup.domNode),
-								iframeCoords = dojo.position(iframes[0]);
-							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
-							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
-							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
-							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
-							doh.is("", iframes[0].style.display, "not display:none");
-						}
-						// TODO: test stack
-					}), 500);
-
-					return d;
-				},
-
-				function closeAround(){
-					// Close the popup
-					var around = dojo.global.choiceDropDownButton,
-						popup = dojo.global.choiceDropDown;
-
-					around.closePopup();
-
-					// Make sure the popup is hidden
-					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
-				}
-			]);
-
-			doh.register("nested open and close", [
-				// Open first level
-				function openAround(){
-					var d = new doh.Deferred();
-
-					var around = dojo.global.nestedDropDownButton,
-						popup = dojo.global.nestedOpener,
-						nestedPopup = dojo.global.nestedChoice1;
-
-					around.openPopup();
-
-					setTimeout(d.getTestCallback(function(){
-						doh.t(isVisible(popup.domNode), "popup is visible");
-
-						if(dojo.isIE <= 6){
-							// Test the BackgroundIFrame
-							var iframes = dojo.query("iframe", popup.domNode.parentNode);
-							doh.is(1, iframes.length, "one background iframe on IE6");
-
-							var popupCoords = dojo.position(popup.domNode),
-								iframeCoords = dojo.position(iframes[0]);
-							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
-							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
-							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
-							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
-							doh.is("", iframes[0].style.display, "not display:none");
-						}
-						// TODO: test stack
-					}), 500);
-
-					return d;
-				},
-
-				function openNested(){
-					var d = new doh.Deferred();
-
-					var around = dojo.global.nestedDropDownButton,
-						popup = dojo.global.nestedOpener,
-						nestedPopup = dojo.global.nestedChoice1;
-
-					popup.openPopup(nestedPopup);
-
-					setTimeout(d.getTestCallback(function(){
-						doh.t(isVisible(nestedPopup.domNode), "nested popup is visible");
-
-						if(dojo.isIE <= 6){
-							// Test the BackgroundIFrame
-							var iframes = dojo.query("iframe", popup.domNode.parentNode);
-							doh.is(1, iframes.length, "one background iframe for popup");
-
-							iframes = dojo.query("iframe", nestedPopup.domNode.parentNode);
-							doh.is(1, iframes.length, "another background iframe for nested popup");
-
-							var popupCoords = dojo.position(nestedPopup.domNode),
-								iframeCoords = dojo.position(iframes[0]);
-							doh.is(popupCoords.x, iframeCoords.x, "x is same: " + popupCoords.x);
-							doh.is(popupCoords.y, iframeCoords.y, "y is same: " + popupCoords.y);
-							doh.is(popupCoords.w, iframeCoords.w, "w is same: " + popupCoords.w);
-							doh.is(popupCoords.h, iframeCoords.h, "h is same: " + popupCoords.h);
-							doh.is("", iframes[0].style.display, "not display:none");
-						}
-						// TODO: test stack
-					}), 500);
-
-					return d;
-				},
-
-				function closeAround(){
-					// Close the layer of popups
-					var around = dojo.global.nestedDropDownButton,
-						popup = dojo.global.nestedOpener,
-						nestedPopup = dojo.global.nestedChoice1;
-
-					around.closePopup();
-
-					// Make sure the popups are both hidden
-					// (in a future release this might change to display:none etc but currently it's visibility:hidden)
-					doh.is("none", popup.domNode.parentNode.style.display, "popup is hidden");
-					doh.is("none", nestedPopup.domNode.parentNode.style.display, "nested popup is hidden");
-				}
-			]);
-
-			// Make sure there are no hidden tab stops when popups are closed.
-			// This test doesn't work on safari (due to safari bugs) although there aren't any hidden tab stops.
-			doh.register("no hidden tab stops", function hiddenTabStops(){
-				var tabbable = tabOrder();
-				doh.is("inputAtStart", tabbable[0].id, "first tabbable node");
-				doh.is("inputAtEnd", tabbable[tabbable.length - 1].id, "last tabbable node");
-			});
-
-			// TODO: test x/y placement
-
-			// Test that onCancel goes back one level.
-			// Call nestedChoice2.onCancel() and that should trigger nestedChoice2 to close
-			// but nestedOpener stays open.
-			// (TODO)
-
-			// Test that onChange/onExecute goes back to top of popup chain.
-			// Call dialogNestedChoice2.onChange() and that should trigger dialogNestedChoice2
-			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
-			// (TODO)
-
-			// ---------------------
-			// a11y tests
-
-			// Test that ESC key closes one level of a popup chain.
-			// Focus nestedChoice2 and type ESC, and that should trigger nestedChoice2 to close
-			// but nestedOpener stays open.
-			// (TODO)
-
-			// Test that TAB key cancels back to top of popup chain.
-			// Focus nestedChoice2 and type TAB, and that should trigger dialogNestedChoice2
-			// and dialogNestedPopupOpener to close, but not dialogWithNestedPopup.
-			// (TODO)
-
-			doh.run();
-		});
-	</script>
-</head>
-<body>
-	<h1>dijit.popup and BackgroundIFrame Unit Test</h1>
-	<input id="inputAtStart">
-	<span id="widgets"></span>
-	<input id="inputAtEnd">
-</body>
-</html>
diff --git a/tests/_base/robot/CrossWindow.html b/tests/_base/robot/CrossWindow.html
deleted file mode 100644
index a3b58fd01..000000000
--- a/tests/_base/robot/CrossWindow.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<title>doh.robot CrossWindow Test</title>
-
-		<style>
-			@import "../../../../util/doh/robot/robot.css";
-		</style>
-
-		<!-- required: dojo.js -->
-		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
-
-		<script type="text/javascript">
-			dojo.require("dijit.robotx");
-			dojo.require("dijit.tests.helpers");	// functions to help test
-
-			dojo.ready(function(){
-				doh.robot.initRobot('../test_CrossWindow.html');
-
-				doh.register("CrossWindow", [
-					{
-						name: "Create widget on main window",
-						timeout: 2000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								var widget = dijit.byId("simple_0");
-								doh.t(widget, "The first widget was not created");
-							}), 1000);
-							return d;
-						}
-					},
-					{
-						name: "Pop up new window",
-						timeout: 3000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							doh.robot.mouseMoveAt("popupLink", 100, 1);
-							doh.robot.mouseClick({left:true}, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								var widget = dijit.byId("simple3");
-								doh.t(widget, "The 3rd widget was not created");
-								doh.is("mainpage", widget.domNode.ownerDocument.body.id);
-								doh.is("Templated in IE Popup Test", widget.domNode.ownerDocument.title);
-
-								widget = dijit.byId("simple2");
-								doh.t(widget, "The 2nd widget was not created");
-								doh.is("popup", widget.domNode.ownerDocument.body.id);
-								doh.is("IE Cross Window", widget.domNode.ownerDocument.title);
-							}), 1000);
-							return d;
-						}
-					}
-				]);
-				doh.run();
-			});
-		</script>
-	</head>
-</html>
diff --git a/tests/_base/robot/FocusManager.html b/tests/_base/robot/FocusManager.html
deleted file mode 100644
index 7745e14c3..000000000
--- a/tests/_base/robot/FocusManager.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-
-<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
-
-<html>
-	<head>
-		<title>Dijit focus manager DOH Robot test</title>
-
-		<style>
-			@import "../../../../util/doh/robot/robot.css";
-		</style>
-
-		<!-- required: dojo.js -->
-		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
-
-		<script type="text/javascript">
-			dojo.require("dijit.robotx");
-
-			dojo.ready(function(){
-				doh.robot.initRobot('../test_FocusManager.html');
-
-				doh.register("Dijit focus manager low level tests", [
-					{
-						name: "set timer to save focus and selection",
-						timeout: 4000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							doh.robot.sequence(function(){
-								dojo.byId("delay_save").focus();
-							}, 500);
-							doh.robot.keyPress(dojo.keys.ENTER, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// This is just here to tell DOH that test is finished
-							}), 500);
-
-							return d;
-						}
-					},
-					{
-						name: "focus textarea and select some text",
-						timeout: 8000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							dojo.byId("textarea").focus();
-
-							// Position caret at " there!"
-							if(dojo.isMac){
-								doh.robot.keyPress(dojo.keys.LEFT_ARROW, 20, {meta: true});
-							}else{
-								doh.robot.keyPress(dojo.keys.HOME, 20, {});
-							}
-							for(var i=0; i<5; i++){
-								doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 20, {});
-							}
-
-							// select " there"
-							for(i=0; i<6; i++){
-								doh.robot.keyPress(dojo.keys.RIGHT_ARROW, 20, {shift: true});
-							}
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// Wait for selection and focus to be copied
-							}), 3000);
-
-							return d;
-						}
-					},
-					{
-						name: "restore focus and selection",
-						timeout: 8000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							// Focus somewhere else
-							doh.robot.sequence(function(){
-								dojo.byId("input1").focus();
-							}, 500);
-
-							// Press restore button
-							doh.robot.sequence(function(){
-								dojo.byId("restore").focus();
-							}, 500);
-
-							doh.robot.keyPress(dojo.keys.SPACE, 500);
-
-							//Move cursor to unselect the text
-							for(i=0; i<2; i++){
-								doh.robot.keyPress(dojo.keys.LEFT_ARROW, 20, {shift: false});
-							}
-
-							// Press restore button again, should restore previous selection.
-							doh.robot.sequence(function(){
-								dojo.byId("restore").focus();
-							}, 500);
-
-							doh.robot.keyPress(dojo.keys.SPACE, 500);
-
-							// Focus should have been moved back to textarea, and
-							// " there" should be selected through the focus restorel
-							// by deleting the selection
-							doh.robot.keyPress(dojo.keys.BACKSPACE, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// Check that focus was returned to the textarea
-								doh.t(dojo.global.dijit.focus.curNode, "curFocus defined");
-								doh.is("textarea", dojo.global.dijit.focus.curNode.id, "focused on textarea");
-
-								// And that " there" was selected then deleted
-								doh.is("hello!", dojo.byId("textarea").value);
-							}), 500);
-							return d;
-						}
-					},
-					{
-						name: "Test select text, clear, and restore",
-						timeout: 8000,
-						runTest: function(){
-							if(!dojo.isIE){ // IE only supports selecting form elements and the whole body from a plain non-Editor page, see the MSDN article on createTextRange
-							var d = new doh.Deferred();
-
-							//Select the text in the p tag.
-							var p = dojo.byId("selectableText");
-							dijit._editor.selection.selectElementChildren(p);
-							var value = dijit._editor.selection.getSelectedText();
-							value = dojo.trim(value);
-							try{
-								doh.assertEqual(
-									"This paragraph contains text to select for testing purposes.",
-								value, "Original Text Selection");
-
-								//Get the current focus, which saves the selections too.
-								var curFocus = dijit.getFocus();
-
-								//Clear current selection.
-								dijit._editor.selection.collapse(true);
-
-								//Check it's cleared.
-								value = dijit._editor.selection.getSelectedText();
-								doh.assertEqual("",value);
-
-								//Restore it and check again.
-								dijit.focus(curFocus);
-								value = dijit._editor.selection.getSelectedText();
-								doh.assertEqual(
-									"This paragraph contains text to select for testing purposes.",
-								value, "Restored Text Selection");
-
-								//Clear the selection, we're complete.
-								dijit._editor.selection.collapse(true);
-								d.callback(true);
-							}catch(e){
-								d.errback(e);
-							}
-							return d;
-							}
-						}
-					}
-				]);
-
-				doh.run();
-			});
-		</script>
-	</head>
-</html>
diff --git a/tests/_base/robot/focus_mouse.html b/tests/_base/robot/focus_mouse.html
deleted file mode 100644
index 8105cf7fd..000000000
--- a/tests/_base/robot/focus_mouse.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-
-<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
-
-<html>
-	<head>
-		<title>Dijit focus manager DOH Robot test</title>
-
-		<style>
-			@import "../../../../util/doh/robot/robot.css";
-		</style>
-
-		<!-- required: dojo.js -->
-		<script type="text/javascript" src="../../../../dojo/dojo.js"></script>
-
-		<script type="text/javascript">
-			dojo.require("dijit.robotx");
-
-			dojo.ready(function(){
-				doh.robot.initRobot('../test_focusWidget.html?animate=false');
-
-				// These are objects used to track calls to _onFocus and _onBlur in various widgets
-				function resetEvents(){
-					focusEvents = {};
-					blurEvents = {};
-					focusedState = {};
-					focusedWatchLog = {};
-				}
-				resetEvents();
-
-				doh.register("Dijit focus manager tests", [
-
-					function setUp(){
-						dojo.forEach(["form", "fieldset1", "fieldset2", "select", "editor", "spinner"], function(id){
-							var w = dijit.byId(id);
-
-							// old API is to connect to onFocus/onBlur (remove in 2.0)
-							dojo.connect(w, "onFocus", function(){
-								focusEvents[id] = true;
-							});
-							dojo.connect(w, "onBlur", function(){
-								blurEvents[id] = true;
-							});
-
-							// new API is to watch "focused" attribute
-							w.watch("focused", function(name, oldValue, newValue){
-								// keep track of current state
-								focusedState[name] = newValue;
-
-								// keep log of every watch notification
-								var nvs = newValue ? "focused" : "blurred";
-								focusedWatchLog[w.id] = !focusedWatchLog[w.id] ? nvs : focusedWatchLog[w.id] + ", " + nvs;
-							});
-						});
-					},
-
-					{
-						name: "focus simple input",
-						timeout: 4000,
-						setUp: function(){
-							resetEvents();
-						},
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							// Focus the simple input
-							//dojo.byId("first").focus();
-							doh.robot.mouseMoveAt("first");
-							doh.robot.mouseClick({left: true}, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// Make sure that focus manager caught the focus event
-								doh.is(dojo.byId("first"), dojo.global.dijit.focus.curNode);
-
-								// And that the dijit.form.Form widget is marked as
-								// being "in focus"
-								doh.t(focusEvents["form"], "form focused");
-								
-								// And that it got one watch event
-								doh.is("focused", focusedWatchLog["form"], "watch callback");
-							}), 500);
-
-							return d;
-						}
-					},
-					{
-						name: "focus combobox",
-						timeout: 4000,
-						setUp: function(){
-							resetEvents();
-						},
-						runTest: function(){
-							var d = new doh.Deferred();
-							handle = dojo.connect(dijit.byId("select").focusNode, "onfocus", d.getTestCallback(function(){
-								// Focus goes to an <input> node deep inside of select.domNode,
-								// but that <input> node has the id of the widget
-								doh.is(dojo.byId("select"), dojo.global.dijit.focus.curNode);
-
-								// The focus stack should show the ComboBox plus all parent widgets
-								var stack = dojo.global.dijit._activeStack;
-								doh.is("form, fieldset1, select", stack.join(", "), "combobox stack");
-
-								// _onFocus()/_onBlur was called appropriately
-								doh.f(focusEvents["form"], "form was already focused, no duplicate event");
-								doh.f(blurEvents["form"], "form wasn't blurred");
-								doh.t(focusEvents["fieldset1"], "fieldset1 focused");
-								doh.t(focusEvents["select"], "select focused");
-								
-								doh.f(focusedWatchLog["form"], "form watch callback (no new notification)");
-								doh.is("focused", focusedWatchLog["fieldset1"], "fieldset watch callback");
-								doh.is("focused", focusedWatchLog["select"], "select watch callback");
-							}));
-							dijit.byId("select").focus();
-
-							return d;
-						},
-						tearDown: function(){
-							dojo.disconnect(handle);
-						}
-					},
-					{
-						name: "focus editor",
-						timeout: 4000,
-						setUp: function(){
-							resetEvents();
-						},
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							dijit.byId("editor").focus();
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// The focus stack should show the Editor plus all parent widgets
-								var stack = dojo.global.dijit._activeStack;
-								doh.is("form, editor", stack.join(", "), "editor stack");
-
-								// _onFocus()/_onBlur was called appropriately
-								doh.f(focusEvents["form"], "form was already focused, no duplicate event");
-								doh.f(blurEvents["form"], "form wasn't blurred");
-								doh.t(blurEvents["fieldset1"], "fieldset no longer focused");
-								doh.t(focusEvents["editor"], "editor focused");
-
-								doh.f(focusedWatchLog["form"], "form watch callback (no new notification)");
-								doh.is("blurred", focusedWatchLog["fieldset1"], "fieldset watch callback, no longer focused");
-								doh.is("blurred", focusedWatchLog["select"], "select watch callback, no longer focused");
-								doh.is("focused", focusedWatchLog["editor"], "editor watch callback");
-							}), 500);
-
-							return d;
-						}
-					},
-
-					// clicking spinner buttons should activate the spinner, even
-					// though there's no actual DOM focus event
-					{
-						name: "spinner",
-						timeout: 8000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							var upArrow = dojo.query(".dijitSpinner .dijitUpArrowButton")[0];
-							doh.t(upArrow, "found the up arrow");
-
-							doh.robot.mouseMoveAt(upArrow, 500);
-							doh.robot.mouseClick({left: true}, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// The focus stack should show the Spinner plus all parent widgets
-								var stack = dojo.global.dijit._activeStack;
-								doh.is("form, fieldset2, spinner", stack.join(", "), "spinner stack");
-
-								// check watch callbacks
-								doh.f(focusedWatchLog["form"], "grandparent of spinner stayed focused, so no new watch event (watch)");
-								doh.is("focused", focusedWatchLog["fieldset2"], "parent of spinner (watch)");
-								doh.is("focused", focusedWatchLog["spinner"], "spinner (watch)");
-							}), 1000);
-
-							return d;
-						}
-					}/*,
-					// FIXME: this test is invalid because focus is not designed to change on mouse click to the first item in the menu
-					{
-						name: "combo button menu",
-						timeout: 4000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							var button = dijit.byId('button').focusNode;
-							doh.t(button, "found drop down button");
-
-							doh.robot.mouseMoveAt(button);
-							doh.robot.mouseClick({left: true}, 500);
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// Focus goes to an first item in the drop down menu
-								doh.is(dojo.byId("mi1").id, dojo.global.dijit.focus.curNode.id);
-
-								// The focus stack should show the ComboBox plus all parent widgets
-								var stack = dojo.global.dijit._activeStack;
-								console.log("menu stack is ", stack);
-								doh.is("form, fieldset2, button, menu, mi1", stack.join(", "), "menuitem stack");
-							}), 500);
-
-							return d;
-						},
-						tearDown: function(){
-							dojo.disconnect(handle);
-						}
-					}*/
-
-/*
-					// Commented out because
-					// in order to allow dijit.popup's getTopPopup() to work,a sub menu's popupParent
-					// points to the parent Menu, bypassing the parent MenuItem... thus the
-					// MenuItem is not in the chain of active widgets
-					{
-						name: "nested menu",
-						timeout: 4000,
-						runTest: function(){
-							var d = new doh.Deferred();
-
-							doh.robot.mouseMoveAt("popupMenuItem");
-
-							doh.robot.sequence(d.getTestCallback(function(){
-								// Focus goes to an first item in the sub menu
-								doh.is(dojo.byId("smi1"), dojo.global.dijit.focus.curNode);
-
-								// The focus stack should show the two submenus and then upwards
-								// to the ComboButton, and the rest
-								var stack = dojo.global.dijit._activeStack;
-								console.log("menu stack is ", stack);
-								doh.is("form, fieldset2, button, menu, mi1, submenu, smi1", stack.join(", "),
-								 	"submenuitem stack");
-							}), 1000);
-
-							return d;
-						}
-					}
-*/
-				]);
-
-				doh.run();
-			});
-		</script>
-	</head>
-</html>
diff --git a/tests/_base/runTests.html b/tests/_base/runTests.html
deleted file mode 100644
index 953fa058f..000000000
--- a/tests/_base/runTests.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-	<head>
-	<title>Dijit _base Unit Test Runner</title>
-	<meta http-equiv="REFRESH" content="0;url=../../../util/doh/runner.html?testModule=dijit.tests._base.module"></HEAD>
-	<BODY>
-		Redirecting to D.O.H runner.
-	</BODY>
-</HTML>
diff --git a/tests/_base/test_CrossWindow.html b/tests/_base/test_CrossWindow.html
deleted file mode 100644
index caf9c314c..000000000
--- a/tests/_base/test_CrossWindow.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-	<head>
-		<title>Templated in IE Popup Test</title>
-		<style>
-			body{
-			font-family:Arial, Helvetica, sans-serif;
-			font-size:12px;
-			}
-		</style>
-		<script type="text/javascript"
-			src="../../../dojo/dojo.js"
-			data-dojo-config="isDebug:true, popup:false, parseOnLoad:false">
-		</script>
-		<script type="text/javascript">
-
-			dojo.require("dijit._Widget");
-			dojo.require("dijit._TemplatedMixin");
-			dojo.require("dojo.parser");
-
-			var w;
-			var popup;
-			var widgetClass;
-			var popwin;
-			var globalDocument;
-			var mainwin = window;
-
-			onPopClose = function(){
-				console.log("setting context back to main window...");
-				dojo.setContext(dojo.global, globalDocument);
-				if(dijit.byId('simple3')){
-					dijit.byId('simple3').destroy();
-				}
-				console.log("Now building the widget in the main window...");
-				var div = dojo.doc.createElement("div");
-				dojo.byId("main").appendChild(div);
-				new widgetClass({id:"simple3"}, div);
-				console.log("There should now be two widgets at the top of the page.");
-			};
-
-			onPopLoad = function(){
-				globalDocument = dojo.doc;
-				dojo.setContext(dojo.global, popwin.document);
-
-				if(dijit.byId('simple2')){
-					dijit.byId('simple2').destroy();
-				}
-				console.log("rendering one widget in popup...");
-
-				var div = dojo.doc.createElement("div");
-				dojo.byId("main").appendChild(div);
-				new widgetClass({id:"simple2"}, div);
-
-				console.log("The widget should have appeared in the popup window.");
-
-				onPopClose();
-			};
-
-			openPopup = function(){
-				popup = window.open('', "mywin", "width=240,height=180");
-				var doc = popup.document;
-
-				var newbcolor = '#FFFFFF';
-				var newfcolor = '$FF0000';
-				var word = "";
-				var HTMLstring = '<HTML><HEAD><TITLE>IE Cross Window</TITLE></HEAD>\n' +
-						'<BODY id="popup" bgColor="' + newbcolor + '">\n' +
-						'<div><div id="main"></div></div>\n' +
-						'</BODY></HTML>';
-
-				doc.write(HTMLstring);
-				doc.close();
-				popup.console = window.console;
-
-
-				// The onload event for IE is written into the above body tag.
-				// This is the onload for Firefox
-				if(dojo.isMoz){
-					popup.onload = onPopLoad;
-				}else{
-					setTimeout(function(){
-						onPopLoad();
-					}, 200);
-				}
-
-				return popup;
-			};
-
-			speedTest = function(){
-				console.log("Speed Test");
-
-				var start = new Date();
-				var amt = 1000;
-
-				var div = dojo.doc.createElement("div");
-				dojo.byId("main").appendChild(div);
-
-				for(var i = 0; i < amt; i++){
-					new widgetClass({id:"simple_" + i}, div);
-				}
-				console.log("Time to render ", amt, " widgets:", (new Date() - start));
-			};
-
-			dojo.ready(function(){
-				widgetClass = dojo.declare(
-					"Simple",
-					[dijit._Widget, dijit._TemplatedMixin], {
-						templateString: '<div> Widget created: ${id} </div>'
-					}
-				);
-
-				speedTest();
-			});
-		</script>
-	</head>
-	<body id="mainpage">
-		<h2>Test for cross window widget building</h2>
-		<p>
-			This test will create a widget in the main window, then in a popup, then another in the main window.
-			Tests issues on IE, namely making sure that nodes are created in the right document, see
-			<a href="http://trac.dojotoolkit.org/ticket/6791">#6791</a>.
-		</p>
-		<p>
-			You must allow popups before running this test.
-			Check console for results.
-		</p>
-		<div id="main"></div>
-		<iframe name="mywin" src="about:blank"></iframe>
-		
-		<a id="popupLink" href="nowhere.html" onclick="popwin = openPopup();return false;">run popup test</a>
-	</body>
-</html>
diff --git a/tests/_base/test_FocusManager.html b/tests/_base/test_FocusManager.html
deleted file mode 100644
index 8c827aeae..000000000
--- a/tests/_base/test_FocusManager.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-
-<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
-
-<html>
-<head>
-	<title>dijit.focus Test</title>
-	<style type="text/css">
-		@import "../../themes/claro/document.css";
-		@import "../../themes/claro/claro.css";
-		@import "../css/dijitTests.css";
-	</style>
-
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript">
-		dojo.require("dijit.focus");		// dijit.focus()
-		dojo.require("dijit._base.focus");	// dijit.getFocus()
-		dojo.require("dijit._editor.selection");	// accessed by robot test
-		var savedFocus, fakeWidget;
-		dojo.ready(function(){
-			fakeWidget = { domNode: dojo.byId("save") };
-			dojo.subscribe("focusNode", function(node){ console.log("focused on " + (node?(node.id||node.tagName):"nothing"));});
-		});
-		function save(){
-			savedFocus = dijit.getFocus(fakeWidget);
-			console.debug("saved focus: ", savedFocus);
-
-		}
-		function restore(){
-			dijit.focus(savedFocus);
-			console.log("restored focus to: ", savedFocus);
-		}
-	</script>
-</head>
-<body style="background-color: #fff; color: black; padding: 0; margin: 0" class="claro">
-
-	<h3>Focus/Selection Save/Restore Test</h3>
-	<p>This is for testing whether focus and selection can be saved and restored by the focus manager.</p>
-	<p>
-		If you press the "Save focus" button, it should save the focus, but not the selection.
-		This is because merely pressing that button makes the focused textarea/input lose focus,
-		which also loses the selection.  (We fudge things by saving the previously focused element rather
-		than the currently focused one.)
-	</p>
-	<p>
-		If you press the "Save focus/selection state after 3 seconds" button, and then focus an input/textarea
-		and select some text, it should (after three seconds) save both the focused element and the selection.
-	</p>
-	<p id="selectableText" style="color: darkred">This paragraph contains text to select for testing purposes.</p>
-	<form style="border: 2px solid blue;">
-		<input id=input1 value=tom autocomplete=off><br>
-		<input id=input2 value=jones autocomplete=off><br>
-		<textarea id=textarea autocomplete=off>hello there!</textarea><br>
-		<button id=button>push me</button>
-	</form>
-
-	<button id="save" onclick="save();">Save focus</button>
-	<button id="delay_save" onclick="console.log('set timer for func'); setTimeout(save, 3000);">Save focus/selection state after 3 seconds</button>
-	<button id="restore" onclick="restore();">Restore focus/selection state</button>
-
-</body>
-</html>
diff --git a/tests/_base/test_focusWidget.html b/tests/_base/test_focusWidget.html
deleted file mode 100644
index 1b0281f21..000000000
--- a/tests/_base/test_focusWidget.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-
-<!-- Remove in 2.0, replaced by dijit/tests/focus.html -->
-
-<html>
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<title>dijit.focus Test</title>
-	<style type="text/css">
-		@import "../../themes/claro/document.css";
-		@import "../../themes/claro/claro.css";
-		@import "../css/dijitTests.css";
-	</style>
-
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true, parseOnLoad: true"></script>
-	<script type="text/javascript">
-		dojo.require("dijit.dijit"); // optimize: load dijit layer
-
-		dojo.require("dijit.form.DateTextBox");
-		dojo.require("dijit.form.ComboBox");
-		dojo.require("dijit.form.NumberSpinner");
-		dojo.require("dijit.form.ComboButton");
-
-		dojo.require("dijit.Menu");
-		dojo.require("dijit.MenuItem");
-		dojo.require("dijit.PopupMenuItem");
-
-		dojo.require("dijit.layout.ContentPane");
-		dojo.require("dijit.Editor");
-
-		dojo.require("dijit._base.focus");
-
-		// This code does animation to change border color and width to show
-		// active vs. non-active widgets.
-		var queue=[];
-		var animation;
-		function animateBorderColor(widget, color, startWidth, endWidth){
-			if(animation){
-				queue.push(arguments);
-				return;
-			}
-			var s = widget.domNode.style;
-			s.borderStyle="solid";
-			s.outlineStyle="solid";
-			animation = dojo.animateProperty({
-				node: widget.domNode,
-				duration: 50,
-				properties: {
-					// depending on browser and node type, sometimes border or outline is ineffective.
-					// doing both seems to work in all cases though (for at least one of them)
-					borderColor: { end: color },
-					borderWidth: { start: startWidth, end: endWidth },
-					outlineColor: { end: color },
-					outlineWidth: { start: startWidth, end: endWidth }
-				},
-				onEnd: function(){
-					animation=null;
-					if(queue.length){
-						animateBorderColor.apply(null, queue.shift());
-					}
-				}
-			});
-			animation.play();
-		}
-
-		// This flag controls animation and can be disabled by the test harness in robot/focus_mouse.html
-		animate = !window.location.search.match("animate=false");
-
-		dojo.ready(function(){
-			dojo.subscribe("widgetFocus", function(widget){
-				console.log("focused on widget " + (widget?widget:"nothing"));
-				if(animate){
-					animateBorderColor(widget, "#ff0000", 1, 3);
-				}
-			});
-			dojo.subscribe("widgetBlur", function(widget){
-				console.log("blurred widget " + (widget?widget:"nothing"));
-				if(animate){
-					animateBorderColor(widget, "#0000ff", 3, 1);
-				}
-			});
-			dojo.subscribe("focusNode", function(node){ console.log("focused on node " + (node?(node.id||node.tagName):"nothing"));});
-
-			// Focus notification also comes through watch() on each widget
-			dijit.registry.forEach(function(widget){
-				widget.watch("focused", function(name, oldValue, newValue){
-					console.log(this.id + "." + name + ": " + oldValue + " ---> " + newValue);
-				});
-			}, this);
-		});
-	</script>
-	<style>
-		div, fieldset, form, input {
-			padding: 3px;
-			margin: 3px;
-			border: 1px solid blue;
-		}
-	</style>
-</head>
-<body style="background-color: #fff; color: black; padding: 0; margin: 0" class="claro">
-
-	<h3>Widget Focus Test</h3>
-	<p>
-		This is for testing code to detect onBlur and onFocus on a widget level.<br>
-		Focused widgets' borders will turn red.<br>
-		Also, check the console log for focus and blur events on widgets.
-	</p>
-
-	<label>a form ContentPane widget:</label><br>
-	<form id="form" data-dojo-type="dijit/layout/ContentPane" >
-		<label for="first">simple input: </label><input id="first"/><br>
-
-		<label>a fieldset ContentPane widget:</label><br>
-		<fieldset id=fieldset1 data-dojo-type="dijit/layout/ContentPane">
-			<label for="select">a ComboBox widget:</label>
-			<select id=select data-dojo-type="dijit/form/ComboBox">
-				<option>this</option>
-				<option>is</option>
-				<option>a</option>
-				<option>list</option>
-			</select>
-			<label for="plain">a plain input:</label>
-			<input id=plain value=plain/>
-		</fieldset>
-		<div id=editor data-dojo-type="dijit/Editor" >
-			Hello world, this is an <i>editor</i>
-		</div>
-		<br>
-		<label>another fieldset ContentPane:</label><br>
-		<fieldset id=fieldset2 data-dojo-type="dijit/layout/ContentPane">
-			<label for="date">a DateTextBox widget:</label>
-			<input id=date data-dojo-type="dijit/form/DateTextBox"/><br>
-
-			<label for="textarea">a plain textarea:</label><br>
-			<textarea id=textarea>hello there!</textarea><br>
-
-			<label for="spinner">a Spinner widget:</label>
-			<input id=spinner data-dojo-type="dijit/form/NumberSpinner" data-dojo-props='value:100'/><br>
-
-			<label>a Combobutton widget:</label>
-			<div id=button data-dojo-type="dijit/form/ComboButton" data-dojo-props='tabIndex:"0"'>
-				<span>push me</span>
-				<div id=menu data-dojo-type="dijit/Menu">
-					<div id=mi1 data-dojo-type="dijit/MenuItem">menu item 1</div>
-					<div id=mi2 data-dojo-type="dijit/MenuItem">menu item 2</div>
-					<div id=popupMenuItem data-dojo-type="dijit/PopupMenuItem">
-						<span>submenu</span>
-						<div id=submenu data-dojo-type="dijit/Menu">
-							<div id=smi1 data-dojo-type="dijit/MenuItem">submenu item 1</div>
-							<div id=smi2 data-dojo-type="dijit/MenuItem">submenu item 2</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</fieldset>
-	</form>
-</body>
-</html>
diff --git a/tests/_base/wai.html b/tests/_base/wai.html
deleted file mode 100644
index 0389b3911..000000000
--- a/tests/_base/wai.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<html>
-<head>
-	<title>Dijit wai unit test</title>
-	<script type="text/javascript" src="../../../dojo/dojo.js"
-		data-dojo-config="isDebug: true"></script>
-	<script type="text/javascript">
-		dojo.require("doh.runner");
-		dojo.require("dijit.dijit");
-
-		dojo.ready(function(){
-			doh.register("dijit.tests._base.wai",
-				[
-					function getWaiRoleOnElementWithNoRole(){
-						var elem = dojo.byId("no-role-or-states");
-						doh.assertFalse(dijit.hasWaiRole(elem));
-						doh.assertEqual("", dijit.getWaiRole(elem));
-					},
-
-					function getEmptyWairoleRole(){
-						var elem = dojo.byId("empty-wairole");
-						doh.assertFalse(dijit.hasWaiRole(elem));
-						doh.assertEqual("", dijit.getWaiRole(elem));
-					},
-
-					function getWairoleRole(){
-						var elem = dojo.byId("wairole");
-						doh.assertTrue(dijit.hasWaiRole(elem));
-						doh.assertEqual("menuitem", dijit.getWaiRole(elem));
-					},
-
-					function getUnprefixedRole(){
-						var elem = dojo.byId("unprefixed-role");
-						doh.assertTrue(dijit.hasWaiRole(elem));
-						doh.assertEqual("menuitem", dijit.getWaiRole(elem));
-					},
-
-					function setWaiRole(){
-						var div = document.createElement("div");
-						dijit.setWaiRole(div, "menuitem");
-						doh.assertEqual("menuitem", div.getAttribute("role"));
-					},
-
-					function setWaiRoleToExistingXHTML(){
-						/* replacing XHTML role w/wai role */
-						var elem=dojo.byId("navigation-role");
-						dijit.setWaiRole(elem, "treeitem");
-						doh.assertEqual("treeitem", elem.getAttribute("role"));
-					},
-
-					function setWaiRoleToExistingWaiRole(){
-						/* replacing wai role w/another wai role */
-						var div= document.createElement("div");
-						dijit.setWaiRole(div, "menuitem");
-						doh.assertTrue(dijit.hasWaiRole(div, "menuitem"));
-						dijit.setWaiRole(div, "treeitem");
-						doh.assertEqual("treeitem", div.getAttribute("role"));
-					},
-
-					function removeAllWaiRole(){
-						var div = document.createElement("div");
-						dijit.setWaiRole(div, "menuitem");
-						doh.assertTrue(dijit.hasWaiRole(div, "menuitem"));
-						dijit.removeWaiRole(div);
-						if(div.hasAttribute){
-							doh.assertFalse(div.hasAttribute("role"));
-						}else{
-							doh.assertTrue(div.getAttribute("role") == null
-								|| div.getAttribute("role") == "");
-						}
-					},
-
-					function getWaiStateOnElementWithNoState(){
-						var elem = dojo.byId("no-role-or-states");
-						doh.assertFalse(dijit.hasWaiState(elem, "checked"));
-						doh.assertEqual("", dijit.getWaiState(elem, "checked"));
-					},
-
-					function getWaiState(){
-						var elem = dojo.byId("checked");
-						doh.assertTrue(dijit.hasWaiState(elem, "checked"));
-						doh.assertEqual("true",
-							dijit.getWaiState(elem, "checked"));
-					},
-
-					function setWaiState(){
-						var div = document.createElement("div");
-						dijit.setWaiState(div, "checked", "true");
-						doh.assertEqual("true",
-							div.getAttribute("aria-checked"));
-					},
-
-					function removeWaiState(){
-						var div = document.createElement("div");
-						dijit.setWaiState(div, "checked", "true");
-						dijit.removeWaiState(div, "checked");
-						doh.assertEqual("", dijit.getWaiState(div, "checked"));
-					}
-				]
-			);
-			doh.run();
-		});
-	</script>
-</head>
-<body>
-	<div id="no-role-or-states"></div>
-	<div id="empty-wairole" role="wairole:"></div>
-	<div id="wairole" role="wairole:menuitem"></div>
-	<div id="unprefixed-role" role="menuitem"></div>
-	<div id="navigation-role" role="contentinfo"></div>
-	<div id="single-role" role="contentinfo"></div>
-	<div id="checked" aria-checked="true"></div>
-</body>
-</html>
diff --git a/tests/module.js b/tests/module.js
index cd71ef18b..57a9d9282 100644
--- a/tests/module.js
+++ b/tests/module.js
@@ -1,5 +1,4 @@
 define([
-	"./_base/module",
 	"./infrastructure-module",
 
 	"./general-module",