diff --git a/src/arraysort/tests/arraysort.html b/src/arraysort/tests/arraysort.html
index 7d613968038..bb81b3a10c9 100644
--- a/src/arraysort/tests/arraysort.html
+++ b/src/arraysort/tests/arraysort.html
@@ -12,10 +12,8 @@ <h1>ArraySort Tests</h1>
 <script type="text/javascript">
 (function() {
     YUI({
-        base: "../../../build/",
-        filters: {arraysort:"debug"},
-        logInclude:{"TestRunner":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false
     }).use("console", "test", "dump", "arraysort", function(Y) {
         
         // Set up the page
diff --git a/src/async-queue/tests/async-queue.html b/src/async-queue/tests/async-queue.html
index 8276ba0a71a..ff4faffe307 100644
--- a/src/async-queue/tests/async-queue.html
+++ b/src/async-queue/tests/async-queue.html
@@ -11,8 +11,9 @@
 <script src="async-queue-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
-    useBrowserConsole: false
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    useBrowserConsole: false,
+    allowRollup: false
 }).use('console-filters', 'async-queue-tests', function (Y) {
 
     new Y.Console({
diff --git a/src/collection/tests/arraylist.html b/src/collection/tests/arraylist.html
index b9b0a95bff9..4142ed4c7da 100644
--- a/src/collection/tests/arraylist.html
+++ b/src/collection/tests/arraylist.html
@@ -11,8 +11,9 @@
 <script src="arraylist-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
-    useBrowserConsole: false
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    useBrowserConsole: false,
+    allowRollup: false
 }).use('console-filters', 'arraylist-tests', function (Y) {
 
     new Y.Console({
diff --git a/src/console-filters/tests/console-filters.html b/src/console-filters/tests/console-filters.html
index 0c9ece479ce..780a2bf9cd7 100644
--- a/src/console-filters/tests/console-filters.html
+++ b/src/console-filters/tests/console-filters.html
@@ -9,7 +9,10 @@
 <script src="../../../build/yui/yui.js"></script>
 <script src="console-filters-tests.js"></script>
 <script>
-YUI({ filter : 'raw' }).use('test','console-filters-tests', function (Y) {
+YUI({
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false
+}).use('test','console-filters-tests', function (Y) {
 
 var yconsole = new Y.Console({ boundingBox:"#log", newestOnTop: false }).
                 plug(Y.Plugin.ConsoleFilters).
diff --git a/src/console/tests/console.html b/src/console/tests/console.html
index 3ae98dde479..b1eec029f7f 100644
--- a/src/console/tests/console.html
+++ b/src/console/tests/console.html
@@ -8,17 +8,13 @@
 
 <div id="log"></div>
 <script src="../../../build/yui/yui.js"></script>
+<script src="console-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
-    modules: {
-        'console-test': {
-            fullpath: 'testsuite.js',
-            requires: ['console-filters','test']
-        }
-    },
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
-}).use('console-filters', 'console-test', function (Y) {
+}).use('console-filters', 'console-tests', function (Y) {
 
     new Y.Console({
         style: 'block',
diff --git a/src/dataschema/tests/dataschema-perf.html b/src/dataschema/tests/dataschema-perf.html
index 7576c672276..409a6f9ebfc 100755
--- a/src/dataschema/tests/dataschema-perf.html
+++ b/src/dataschema/tests/dataschema-perf.html
@@ -11,10 +11,9 @@ <h1>DataSchema Performance Tests</h1>
 
 <script type="text/javascript">
 YUI({
-    base: "../../../build/",
-    filter: "debug",
-    logInclude:{"perf":true, "dataschema-json":true, "dataschema-xml":true},
-    useConsole: true
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
+    useBrowserConsole: false
 }).use("console", "profiler", "dump", "datatype", "dataschema", function(Y) {
 
     // Set up the page
diff --git a/src/dataschema/tests/dataschema.html b/src/dataschema/tests/dataschema.html
index 7af556477c5..47afab1351a 100755
--- a/src/dataschema/tests/dataschema.html
+++ b/src/dataschema/tests/dataschema.html
@@ -3,7 +3,6 @@
 <head>
 <title>DataSchema Tests</title>
 <script type="text/javascript" src="../../../build/yui/yui.js"></script>
-<script type="text/javascript" src="../../../build/dataschema/dataschema-debug.js"></script>
 </head>
 
 <body class="yui3-skin-sam">
@@ -49,10 +48,9 @@ <h1>DataSchema Tests</h1>
 
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "raw",
-        logInclude:{"TestRunner":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false,
+        useBrowserConsole: false
     }).use("console", "test", "dump", "dataschema", "datatype", function(Y) {
         
         // Set up the page
diff --git a/src/datasource/tests/datasource-perf.html b/src/datasource/tests/datasource-perf.html
index 3b304a2bee1..e5e07af4f40 100755
--- a/src/datasource/tests/datasource-perf.html
+++ b/src/datasource/tests/datasource-perf.html
@@ -12,10 +12,9 @@ <h1>DataSource Performance Tests</h1>
 <script type="text/javascript">
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "debug",
-        logInclude:{"perf":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false,
+        useBrowserConsole: false
     }).use("console", "profiler", "dump", "datasource", function(Y) {
         
         // Set up the page
diff --git a/src/datasource/tests/datasource.html b/src/datasource/tests/datasource.html
index afb242d9730..7fece1b4ecb 100755
--- a/src/datasource/tests/datasource.html
+++ b/src/datasource/tests/datasource.html
@@ -3,7 +3,6 @@
 <head>
 <title>DataSource Tests</title>
 <script type="text/javascript" src="../../../build/yui/yui.js"></script>
-<script type="text/javascript" src="../../../build/datasource/datasource-debug.js"></script>
 </head>
 
 <body class="yui3-skin-sam">
@@ -14,10 +13,9 @@ <h1>DataSource Tests</h1>
 
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "raw",
-        logInclude:{"TestRunner":true,"datasource":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false,
+        useBrowserConsole: true
     }).use("dump", "test", "console", "io-base", "cache", "base", "plugin", "json", "datatype", "dataschema", "datasource", function(Y) {
 
         var ASSERT = Y.Assert,
diff --git a/src/datatable/tests/datatable-manual.html b/src/datatable/tests/datatable-manual.html
index 24d707b959b..4f59c2468c6 100644
--- a/src/datatable/tests/datatable-manual.html
+++ b/src/datatable/tests/datatable-manual.html
@@ -99,10 +99,9 @@ <h3>Scrolling Datatable with Big Headers</h3>
  
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "debug",
-        logInclude:{"TestRunner":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false,
+        useBrowserConsole: true
     }).use("console", "test", "dump", "datatable","node","json-parse", function(Y) {
 	
 
diff --git a/src/datatable/tests/datatable.html b/src/datatable/tests/datatable.html
index 6c94e6d8a20..9801caed669 100644
--- a/src/datatable/tests/datatable.html
+++ b/src/datatable/tests/datatable.html
@@ -103,10 +103,9 @@ <h3>Scrolling Datatable with no width or height set</h3>
  
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "debug",
-        logInclude:{"TestRunner":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false,
+        useBrowserConsole: false
     }).use("console", "test", "dump", "datatable", "profiler","node","json-parse", function(Y) {
 	
 
diff --git a/src/datatable/tests/performance.html b/src/datatable/tests/performance.html
index 1f636794e48..47ef6893af6 100644
--- a/src/datatable/tests/performance.html
+++ b/src/datatable/tests/performance.html
@@ -7,10 +7,12 @@
 		
 		<div id="node"></div>
 		
-		<script src="http://localhost:8888/yui3/build/yui/yui-debug.js"></script>
+		<script src="../../../build/yui/yui.js"></script>
 		
 		<script>
-			 var Y = YUI({filter:'raw'}).use('node', function(Y) {
+			 var Y = YUI({
+                filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min'
+              }).use('node', function(Y) {
 			  YNode = Y.Node;
 			  YSub = Y.Lang.sub;
 			
diff --git a/src/event/tests/event-synthetic.html b/src/event/tests/event-synthetic.html
index 98d4b514a2f..5dafc8987a2 100644
--- a/src/event/tests/event-synthetic.html
+++ b/src/event/tests/event-synthetic.html
@@ -11,7 +11,8 @@
 <script src="event-synthetic-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     lazyEventFacade: true,
     useBrowserConsole: false
 })
diff --git a/src/json/tests/json.html b/src/json/tests/json.html
index a866cd2cecc..2fb1a15e8da 100644
--- a/src/json/tests/json.html
+++ b/src/json/tests/json.html
@@ -13,7 +13,8 @@
 <script src="json-stringify-tests.js"></script-->
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
 }).use('console-filters', 'json-tests', function (Y) {
 
diff --git a/src/jsonp/tests/jsonp.html b/src/jsonp/tests/jsonp.html
index 1ab3205240c..664f20a01a1 100644
--- a/src/jsonp/tests/jsonp.html
+++ b/src/jsonp/tests/jsonp.html
@@ -21,7 +21,8 @@ <h2>jsonp-url tests</h2>
 <script src="jsonp-url-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
 }).use('console-filters', 'jsonp-tests', function (Y) {
 
diff --git a/src/pluginattr/js/attr.js b/src/pluginattr/js/attr.js
index 95735339fa7..0040686b813 100644
--- a/src/pluginattr/js/attr.js
+++ b/src/pluginattr/js/attr.js
@@ -25,7 +25,7 @@ var Lang       = Y.Lang,
  * configuration, override the setter.  To have attribute access respond
  * with more useful (truthy) data, override the getter.</p>
  *
- * <p>Note: the setter should return the plugin class or
+ * <p>Note: the setter should return the plugin instance or
  * <code>Y.Attribute.INVALID_VALUE</code>.</p>
  *
  * <pre><code>
@@ -34,8 +34,6 @@ var Lang       = Y.Lang,
  *         var plugin = Y.Attribute.INVALID_VALUE;
  *
  *         if (attr.indexOf('.') === -1) {
- *             plugin = Y.ConsoleFilters;
- *
  *             if (Y.Lang.isString(val) || Y.Lang.isArray(val)) {
  *                 var cats = Y.Array.hash(Y.Array(val));
  *                 val = {
@@ -46,10 +44,12 @@ var Lang       = Y.Lang,
  *             
  *             if (val !== false) {
  *                 val = (Y.Lang.isObject(val)) ? val : {};
- *                 this.plug(plugin, val);
+ *                 this.plug(Y.Plugin.ConsoleFilters, val);
  *             } else {
- *                 this.unplug(plugin);
+ *                 this.unplug(Y.Plugin.ConsoleFilters);
  *             }
+ *
+ *             plugin = this[Y.Plugin.ConsoleFilters.NS];
  *         }
  *
  *         return plugin;
@@ -69,46 +69,42 @@ var Lang       = Y.Lang,
  * @param {Boolean} force Redefine the existing host attribue if found
  */
 Y.Plugin.addHostAttr = function (name, host, plugin, force) {
-    if (isString(name) && isObject(host) && isObject(plugin)) {
-        var attrDef = { lazyAdd: false };
-
-        if (isFunction(plugin)) {
-            attrDef.setter = function (val, attr) {
-                var method = (val !== false) ? 'plug' : 'unplug',
-                    ret    = Y.Attribute.INVALID_VALUE,
-                    conf   = (isObject(val)) ? val : {};
+    if (!isString(name) || !isObject(host) || !isObject(plugin)) {
+        return false;
+    }
 
-                // For now, disallow subattribute as a trigger or
-                // plugin attribute setter
-                if (attr.indexOf('.') === -1) {
-                    ret = plugin;
+    var attrDef = { lazyAdd: false };
 
-                    conf.host = this;
+    if (isFunction(plugin)) {
+        attrDef.setter = function (val, attr) {
+            var method = (val !== false) ? 'plug' : 'unplug',
+                ret    = Y.Attribute.INVALID_VALUE,
+                conf   = (isObject(val)) ? val : {};
 
-                    this[method](plugin, conf);
-                }
+            // For now, disallow subattribute as a trigger or
+            // plugin attribute setter
+            if (attr.indexOf('.') === -1) {
+                conf.host = this;
 
-                return ret;
-            };
-            attrDef.getter = function () {
-                // TODO: Or return config state as object literal?
-                return this[plugin.NS];
-            };
-        } else {
-            Y.mix(attrDef, plugin, true);
-        }
+                this[method](plugin, conf);
 
-        if (isFunction(host)) {
-            if (host.ATTRS && (force || !host.ATTRS[name])) {
-                host.ATTRS[name] = attrDef;
+                ret = this[plugin.NS];
             }
-        } else if (host.constructor.ATTRS && host.addAttr &&
-                host._state && (force || !host.attrAdded(name))) {
-            host.addAttr(name, attrDef, false);
-        }
 
-        return true;
+            return ret;
+        };
+    } else {
+        Y.mix(attrDef, plugin, true);
+    }
+
+    if (isFunction(host)) {
+        if (host.ATTRS && (force || !host.ATTRS[name])) {
+            host.ATTRS[name] = attrDef;
+        }
+    } else if (host.constructor.ATTRS && host.addAttr &&
+            host._state && (force || !host.attrAdded(name))) {
+        host.addAttr(name, attrDef, false);
     }
 
-    return false;
+    return true;
 };
diff --git a/src/pluginattr/tests/pluginattr.html b/src/pluginattr/tests/pluginattr.html
index 4eb88d44f57..da1755e7966 100644
--- a/src/pluginattr/tests/pluginattr.html
+++ b/src/pluginattr/tests/pluginattr.html
@@ -12,7 +12,8 @@
 <script src="pluginattr-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
 }).use('console-filters', 'pluginattr-tests', function (Y) {
 
diff --git a/src/recordset/tests/recordset.html b/src/recordset/tests/recordset.html
index 757f08762cf..9d50f8a1bbc 100755
--- a/src/recordset/tests/recordset.html
+++ b/src/recordset/tests/recordset.html
@@ -12,10 +12,8 @@ <h1>Recordset Tests</h1>
 <script type="text/javascript">
 (function() {
     YUI({
-        base: "../../../build/",
-        filter: "debug",
-        logInclude:{"TestRunner":true},
-        useConsole: true
+        filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+        allowRollup: false
     }).use("console", "test", "dump", "recordset", function(Y) {
 	
 
diff --git a/src/slider/tests/slider.html b/src/slider/tests/slider.html
index 08a4730d6d5..53fbf1c8bb6 100644
--- a/src/slider/tests/slider.html
+++ b/src/slider/tests/slider.html
@@ -11,7 +11,8 @@
 <script src="slider-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
 }).use('console-filters', 'slider-tests', function (Y) {
 
diff --git a/src/stylesheet/tests/stylesheet.html b/src/stylesheet/tests/stylesheet.html
index 1dd24c93946..fa09d84473a 100644
--- a/src/stylesheet/tests/stylesheet.html
+++ b/src/stylesheet/tests/stylesheet.html
@@ -11,7 +11,8 @@
 <script src="stylesheet-tests.js"></script>
 <script>
 YUI({
-    filter: 'raw',
+    filter: (window.location.search.match(/[?&]filter=([^&]+)/) || [])[1] || 'min',
+    allowRollup: false,
     useBrowserConsole: false
 }).use('console-filters', 'stylesheet-tests', function (Y) {