Fix up unit tests

packages/node_modules/@node-red/runtime/lib/index.js

@@ -53,6 +53,7 @@ var adminApi = {
 }
 
 var nodeApp;
+var adminApp;
 var server;
 
 
@@ -64,12 +65,13 @@ var server;
  *                              better abstracted.
  * @memberof @node-red/runtime
  */
-function init(userSettings,httpServer,_adminApi) {
+function init(userSettings,httpServer,_adminApi,__util) {
     server = httpServer;
     userSettings.version = getVersion();
     settings.init(userSettings);
 
     nodeApp = express();
+    adminApp = express();
 
     if (_adminApi) {
         adminApi = _adminApi;
@@ -78,6 +80,13 @@ function init(userSettings,httpServer,_adminApi) {
     library.init(runtime);
     externalAPI.init(runtime);
     exec.init(runtime);
+    if (__util) {
+        log = __util.log;
+        i18n = __util.i18n;
+    } else {
+        log = redUtil.log;
+        i18n = redUtil.i18n;
+    }
 }
 
 var version;
@@ -103,7 +112,6 @@ function getVersion() {
  * @memberof @node-red/runtime
  */
 function start() {
-
     return i18n.registerMessageCatalog("runtime",path.resolve(path.join(__dirname,"..","locales")),"runtime.json")
         .then(function() { return storage.init(runtime)})
         .then(function() { return settings.load(storage)})
@@ -269,6 +277,7 @@ var runtime = {
     exec: exec,
     util: require("@node-red/util").util,
     get adminApi() { return adminApi },
+    get adminApp() { return adminApp },
     get nodeApp() { return nodeApp },
     get server() { return server },
     isStarted: function() {
@@ -346,8 +355,12 @@ module.exports = {
 
     storage: storage,
     events: events,
+    util: require("@node-red/util").util,
     get httpNode() { return nodeApp },
-    get server() { return server }
+    get httpAdmin() { return adminApp },
+    get server() { return server },
+
+    "_": runtime
 }