diff --git a/package.json b/package.json
index 1397fdc8..e3dde7c0 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.tern": "#45e5f5b0e5",
         "c9.ide.language.javascript.infer": "#0561c69d67",
         "c9.ide.language.jsonalyzer": "#243e11bd42",
-        "c9.ide.collab": "#e2411fc12b",
+        "c9.ide.collab": "#4b93a497cd",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c3bf17286d",
@@ -108,7 +108,7 @@
         "c9.ide.run": "#f03e4b018e",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#a1b39e0ac4",
-        "c9.ide.save": "#1ab1840513",
+        "c9.ide.save": "#f8aaf93ea1",
         "c9.ide.scm": "#ca3c94b84f",
         "c9.ide.terminal.monitor": "#a0d1f02991",
         "c9.ide.test": "#a282ec1619",
diff --git a/plugins/c9.cli.publish/publish_test.js b/plugins/c9.cli.publish/publish_test.js
index 2eb96fff..d266b644 100644
--- a/plugins/c9.cli.publish/publish_test.js
+++ b/plugins/c9.cli.publish/publish_test.js
@@ -1,6 +1,7 @@
 /*global describe it before after beforeEach afterEach define*/
 "use strict";
 "use server";
+"use blacklist";
 
 require("c9/inline-mocha")(module);
 
diff --git a/plugins/c9.fs/mock/test_broken.php b/plugins/c9.fs/mock/test_broken.php
index 6ff3275a..439ff7b3 100644
--- a/plugins/c9.fs/mock/test_broken.php
+++ b/plugins/c9.fs/mock/test_broken.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 this is bad php, obviously
 
diff --git a/plugins/c9.fs/proc_test.js b/plugins/c9.fs/proc_test.js
index 4b7ada4c..db68c57e 100644
--- a/plugins/c9.fs/proc_test.js
+++ b/plugins/c9.fs/proc_test.js
@@ -37,7 +37,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
 
         describe('proc', function() {
             describe('spawn()', function() {
-                this.timeout(10000);
+                this.timeout(4000);
                 
                 it("should spawn a child process", function(done) {
                     var args = ["-e", "process.stdin.pipe(process.stdout);try{process.stdin.resume()}catch(e) {};"];
@@ -108,7 +108,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
                 this.timeout(30000);
                 
                 it("Terminal Test", function(done) {
-                    var look = /\]0;.*\-\-color=auto/;
+                    var look = "--color=auto";
                     
                     var args = ["-is"];
                     proc.pty("bash", {
@@ -124,14 +124,13 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai)
                         var hadRows = false;
                         
                         pty.on("data", function(data) {
-                            
                             if (typeof data == "object" && data.rows) {
                                 expect(data).property("rows").is.equal(80);
                                 expect(data).property("cols").is.equal(80);
                                 hadRows = true;
                             } else {
                                 stdout.push(data);
-                                if (hadRows && stdout.join("").match(look) > -1)
+                                if (hadRows && stdout.join("").indexOf(look) > -1)
                                     pty.kill();
                             }
                         });
diff --git a/plugins/c9.ide.editors/tab.js b/plugins/c9.ide.editors/tab.js
index 37f4d4e6..5457b4c6 100644
--- a/plugins/c9.ide.editors/tab.js
+++ b/plugins/c9.ide.editors/tab.js
@@ -431,7 +431,7 @@ define(function(require, module, exports) {
                  */
                 get backgroundColor(){ return bg },
                 set backgroundColor(v) {
-                    bg = v;
+                    bg = v || "";
                     if (!rule) 
                         return initStyleSheet(fg, bg);
                     ui.setStyleRule(rule, "background-color", bg, stylesheet);