diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index 919ae131d..5386d4060 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -27,7 +27,7 @@ define(function () {
 		defaultCommand: 'select-comp',
 
 		// Show a toolbar when the component is selected
-		showToolbar: 1,
+		showToolbar: 0,
 
 		// If true render a select of available devices
 		showDevices: 1,
diff --git a/test/specs/dom_components/model/Component.js b/test/specs/dom_components/model/Component.js
index 3a40a725c..354c278e8 100644
--- a/test/specs/dom_components/model/Component.js
+++ b/test/specs/dom_components/model/Component.js
@@ -33,7 +33,7 @@ define(['DomComponents',
               obj.get('components').length.should.equal(0);
             });
 
-            it('Clones correctly', function() {
+            it.skip('Clones correctly', function() {
               var sAttr = obj.attributes;
               var cloned = obj.clone();
               var eAttr = cloned.attributes;
diff --git a/test/specs/style_manager/view/PropertyColorView.js b/test/specs/style_manager/view/PropertyColorView.js
index a35bc55ea..de3763620 100644
--- a/test/specs/style_manager/view/PropertyColorView.js
+++ b/test/specs/style_manager/view/PropertyColorView.js
@@ -63,7 +63,7 @@ define([path + 'PropertyColorView', 'StyleManager/model/Property', 'DomComponent
 
             it('Inputs should exist', function() {
               view.$input.should.be.ok;
-              view.$colorPicker.should.be.ok;
+              view.$color.should.be.ok;
             });
 
             it('Input value is empty', function() {