diff --git a/res/app/control-panes/dashboard/shell/shell-controller.js b/res/app/control-panes/dashboard/shell/shell-controller.js
index 8859bca3..fa58b1dc 100644
--- a/res/app/control-panes/dashboard/shell/shell-controller.js
+++ b/res/app/control-panes/dashboard/shell/shell-controller.js
@@ -1,6 +1,4 @@
-module.exports = function ShellCtrl($scope, gettext) {
-  // TODO: implement multiple devices
-//  $scope.results = []
+module.exports = function ShellCtrl($scope) {
   $scope.result = null
 
   $scope.referenceUrl = '/#!/help/shell'
diff --git a/res/app/control-panes/dashboard/shell/shell-spec.js b/res/app/control-panes/dashboard/shell/shell-spec.js
index d0de48de..f430e56d 100644
--- a/res/app/control-panes/dashboard/shell/shell-spec.js
+++ b/res/app/control-panes/dashboard/shell/shell-spec.js
@@ -1,17 +1,24 @@
 describe('ShellCtrl', function () {
 
-  beforeEach(angular.mock.module(require('./').name));
+  beforeEach(angular.mock.module(require('./').name))
 
-  var scope, ctrl;
+  var scope, ctrl
 
   beforeEach(inject(function ($rootScope, $controller) {
-    scope = $rootScope.$new();
-    ctrl = $controller('ShellCtrl', {$scope: scope});
-  }));
+    scope = $rootScope.$new()
+    ctrl = $controller('ShellCtrl', {$scope: scope})
+  }))
 
-  it('should ...', inject(function () {
-    expect(1).toEqual(1);
+  it('should have a reference url', inject(function () {
+    expect(scope.referenceUrl).toEqual('/#!/help/shell')
+  }))
 
-  }));
+  it('should clear the results', inject(function () {
+    scope.result = ['result']
+    scope.run('clear')
+    expect(scope.result).toBe(null)
+    expect(scope.data).toBe('')
+    expect(scope.command).toBe('')
+  }))
 
-});
+})
diff --git a/res/app/control-panes/logs/logs-controller.js b/res/app/control-panes/logs/logs-controller.js
index a316f79f..07cf8400 100644
--- a/res/app/control-panes/logs/logs-controller.js
+++ b/res/app/control-panes/logs/logs-controller.js
@@ -21,7 +21,9 @@ module.exports = function LogsCtrl($scope, LogcatService) {
   })
 
   window.onbeforeunload = function () {
-    $scope.control.stopLogcat()
+    if ($scope.control) {
+      $scope.control.stopLogcat()
+    }
   }
 
   $scope.clear = function () {
diff --git a/res/app/views/index.jade b/res/app/views/index.jade
index e34d87fc..cd338e32 100644
--- a/res/app/views/index.jade
+++ b/res/app/views/index.jade
@@ -14,7 +14,8 @@ html
   body(ng-app='app', ng-cloak).bg-1.fill-height
     div(ng-controller='LayoutCtrl', basic-mode, admin-mode, landscape).fill-height
       .pane-top(fa-pane).fill-height
-        .pane-top-bar(fa-pane, pane-id='menu', pane-anchor='north', pane-size='44px', pane-min='44px', pane-max='44px', pane-handle='')
+        .pane-top-bar(fa-pane, pane-id='menu', pane-anchor='north', pane-size='44px',
+          pane-min='44px', pane-max='44px', pane-handle='')
           div(ng-include='"menu.jade"')
 
         .pane-center(fa-pane, pane-id='main', pane-anchor='center').fill-height
diff --git a/res/test/karma.conf.js b/res/test/karma.conf.js
index ebc09b20..b30f5625 100644
--- a/res/test/karma.conf.js
+++ b/res/test/karma.conf.js
@@ -63,7 +63,8 @@ module.exports = function (config) {
 
     // Start these browsers, currently available:
     // Chrome, ChromeCanary, Firefox, Opera, Safari, PhantomJS, IE
-    browsers: ['PhantomJS'],
+    browsers: ['Chrome'],
+    //browsers: ['PhantomJS'],
 
     plugins: [
       require('karma-jasmine'),