diff --git a/package.json b/package.json
index f84532b1..3b530222 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#4de6a0b9a4",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#326087f5a2",
-        "c9.ide.scm": "#30951575e3",
+        "c9.ide.scm": "#0c01da16be",
         "c9.ide.terminal.monitor": "#b52a3f2144",
         "c9.ide.theme.flat": "#2de8414db7",
         "c9.ide.threewaymerge": "#229382aa0b",
diff --git a/plugins/c9.fs/fs.cache.xml_test.js b/plugins/c9.fs/fs.cache.xml_test.js
index 19eb864a..5014fe2d 100644
--- a/plugins/c9.fs/fs.cache.xml_test.js
+++ b/plugins/c9.fs/fs.cache.xml_test.js
@@ -24,15 +24,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "events"],
         "plugins/c9.ide.ui/ui",
         "plugins/c9.ide.ui/lib_apf",
         "plugins/c9.fs/fs.cache.xml",
-        {
-            consumes: [],
-            provides: ["watcher"],
-            setup: function(options, imports, register) {
-                register(null, {
-                    watcher: new EventEmitter()
-                });
-            }
-        },
         {
             packagePath: "plugins/c9.fs/fs",
             baseProc: baseProc
@@ -41,14 +32,6 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "events"],
         "plugins/c9.vfs.client/vfs_client",
         "plugins/c9.vfs.client/endpoint",
         "plugins/c9.ide.auth/auth",
-         // Mock plugins
-        {
-            consumes: ["apf", "ui", "Plugin"],
-            provides: [
-                "auth.bootstrap", "info", "dialog.error"
-            ],
-            setup: expect.html.mocked
-        },
         {
             consumes: ["fs.cache", "fs", "proc", "watcher"],
             provides: [],
diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index c40b5af9..425e995e 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -4,8 +4,9 @@ require([
     "lib/chai/chai", 
     "text!plugins/c9.ide.layout.classic/skins.xml", 
     "events",
-    "text!/static/standalone/skin/default/dark.css"
-], function (chai, skin, events, theme) {
+    "text!/static/standalone/skin/default/dark.css",
+    "lib/architect/architect"
+], function (chai, skin, events, theme, architect) {
     "use strict";
     var expect = chai.expect;
     var EventEmitter = events.EventEmitter;
@@ -476,10 +477,16 @@ require([
                 var x = new EventEmitter();
                 return x;
             })(),
+            "scm": (function(){
+                var x = new EventEmitter();
+                x.register = function(){};
+                x.unregister = function(){};
+                return x;
+            })(),
         });
     };
     
-    expect.setupArchitectTest = function(config, architect, options) {
+    expect.setupArchitectTest = function(config, _, options) {
         if (options && options.mockPlugins) {
             config.push({
                 consumes: [],
@@ -490,23 +497,22 @@ require([
         architect.resolveConfig(config, function(err, config) {
             /*global describe it before after = */
             if (err) throw err;
-            var app = window.app = architect.createApp(config, function(err, app) {
+            var app = architect.createApp(config, function(err, app) {
                 if (err && err.unresolved && !config.unresolved) {
                     console.warn("Adding mock services for " + err.unresolved);
                     config.unresolved = err.unresolved;
-                    expect.setupArchitectTest(config, architect, {
+                    return expect.setupArchitectTest(config, architect, {
                         mockPlugins: config.unresolved
                     });
-                    return;
                 }
-                
-                describe('app', function() {
-                    it('should load test app', function(done) {
-                        expect(err).not.ok;
-                        done();
+                if (typeof describe == "function") {
+                    describe('app', function() {
+                        it('should load test app', function(done) {
+                            expect(err).not.ok;
+                            done();
+                        });
                     });
-                });
-            
+                }
                 onload && onload();
                 
             });
@@ -518,7 +524,9 @@ require([
                 app.rerun = function() {
                     expect.setupArchitectTest(config, architect);
                 };
+                window.app = app;
             }
+            return app;
         });
     };