diff --git a/test/unit/behaviors-elements.html b/test/unit/behaviors-elements.html
index 3ceaba2ea1..e9e8f98211 100644
--- a/test/unit/behaviors-elements.html
+++ b/test/unit/behaviors-elements.html
@@ -139,7 +139,6 @@
 
       behaviors: [
         Polymer.BehaviorA,
-        null,
         Polymer.BehaviorB
       ],
 
@@ -260,4 +259,4 @@
 
   });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
index d45b372283..09e0222119 100644
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -127,6 +127,27 @@
     assert.equal(el.attributes.user.value, 'user', 'Behavior hostAttribute overrode user attribute');
   });
 
+  test('behaviour is null generates warning', function() {
+    var warned = false, oldWarn = Polymer.Base._warn;
+    Polymer.Base._warn = function (message) {
+      assert.match(message, /behavior is null/);
+      warned = true;
+    };
+
+    Polymer({
+
+      behaviors: [
+        null
+      ],
+
+      is: 'behavior-null'
+
+    });
+
+    assert.equal(warned, true, 'Null behaviour should generate warning');
+    Polymer.Base._warn = oldWarn;
+  });
+
 });
 
 
diff --git a/test/unit/bind.html b/test/unit/bind.html
index b281f8f5a5..bdb07d3634 100644
--- a/test/unit/bind.html
+++ b/test/unit/bind.html
@@ -650,7 +650,6 @@
     var warned = false;
     el._warn = function() {
       warned = true;
-      warn.apply(el, arguments);
     };
     el.noObserver = 42;
     assert.equal(warned, true, 'no warning for undefined observer');
@@ -660,7 +659,6 @@
     var warned = false;
     el._warn = function() {
       warned = true;
-      warn.apply(el, arguments);
     };
     el.noComplexObserver = {};
     assert.equal(warned, true, 'no warning for undefined complex observer');
@@ -670,7 +668,6 @@
     var warned = false;
     el._warn = function() {
       warned = true;
-      warn.apply(el, arguments);
     };
     el.noComputed = 99;
     assert.equal(warned, true, 'no warning for undefined computed function');
@@ -680,7 +677,6 @@
     var warned = false;
     el._warn = function() {
       warned = true;
-      warn.apply(el, arguments);
     };
     el.noInlineComputed = 99;
     assert.equal(warned, true, 'no warning for undefined computed function');
diff --git a/test/unit/css-parse.html b/test/unit/css-parse.html
index 0defe0af71..59bd1d5828 100644
--- a/test/unit/css-parse.html
+++ b/test/unit/css-parse.html
@@ -116,7 +116,6 @@
       assert.equal(tree.rules.length, 4, 'unexpected number of rules');
       assert.equal(tree.rules[2].rules.length, 8, 'unexpected number of rules in keyframes');
       assert.equal(tree.rules[3].rules.length, 1, 'unexpected number of rules in @media');
-      console.log('test');
     });
 
     test('rule selectors parse', function() {
diff --git a/test/unit/dom-bind-elements2.html b/test/unit/dom-bind-elements2.html
index 5dad951a45..be6e482dee 100644
--- a/test/unit/dom-bind-elements2.html
+++ b/test/unit/dom-bind-elements2.html
@@ -1,5 +1,4 @@
 <script>
-console.log('x-needs-repeat loaded')
   Polymer({
     is: 'x-needs-host',
     ready: function() {
@@ -9,4 +8,4 @@
       this.config = this.dataHost.getAttribute('config');
     }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/test/unit/dom-bind.html b/test/unit/dom-bind.html
index 2b40a3762c..e44f38193b 100644
--- a/test/unit/dom-bind.html
+++ b/test/unit/dom-bind.html
@@ -226,6 +226,5 @@
   </script>
 
   <link rel="import" href="dom-bind-elements2.html">
-  <link rel="import" href="should-404.html">
 </body>
 </html>
diff --git a/test/unit/dom-repeat.html b/test/unit/dom-repeat.html
index bf9fd5a9d5..a29ef2489c 100644
--- a/test/unit/dom-repeat.html
+++ b/test/unit/dom-repeat.html
@@ -103,9 +103,13 @@ <h4>x-repeat-chunked</h4>
     suite('errors', function() {
 
       test('items must be array', function() {
-        assert.throws(function() {
-          inDocumentRepeater.items = {};
-        }, /expected array/, 'should warn when items is not array');
+        var warned = false;
+        inDocumentRepeater._error = function(message) {
+          assert.match(message, /expected array/)
+          warned = true;
+        }
+        inDocumentRepeater.items = {};
+        assert.equal(warned, true, 'should warn when items is not array');
       });
 
     });
diff --git a/test/unit/sub/foo.png b/test/unit/sub/foo.png
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/unit/sub/foo.z b/test/unit/sub/foo.z
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/unit/sub/google.png b/test/unit/sub/google.png
new file mode 100644
index 0000000000..e69de29bb2