diff --git a/tests/all.js b/tests/all.js
index 45900f5f9..3ea6d3d41 100644
--- a/tests/all.js
+++ b/tests/all.js
@@ -10,21 +10,21 @@ describe('All Tests', function() {
   });
 
   after(function() {});
-  //require('./tests/classes/ServerlessStateTest');
-  //require('./tests/classes/ServerlessProjectTest');
-  //require('./tests/classes/ServerlessComponentTest');
-  //require('./tests/classes/ServerlessFunctionTest');
-  //require('./tests/classes/ServerlessEndpointTest');
-  //require('./tests/actions/TestPluginCustom');
-  //require('./tests/actions/TestDefaultActionHook');
-  //require('./tests/actions/StageCreate');
-  //require('./tests/actions/RegionCreate');
-  //require('./tests/actions/ComponentCreate');
-  //require('./tests/actions/FunctionCreate');
-  //require('./tests/actions/EnvList');
-  //require('./tests/actions/EnvGet');
-  //require('./tests/actions/EnvSetUnset');
-  //require('./tests/actions/ResourcesDeploy');
+  require('./tests/classes/ServerlessStateTest');
+  require('./tests/classes/ServerlessProjectTest');
+  require('./tests/classes/ServerlessComponentTest');
+  require('./tests/classes/ServerlessFunctionTest');
+  require('./tests/classes/ServerlessEndpointTest');
+  require('./tests/actions/TestPluginCustom');
+  require('./tests/actions/TestDefaultActionHook');
+  require('./tests/actions/StageCreate');
+  require('./tests/actions/RegionCreate');
+  require('./tests/actions/ComponentCreate');
+  require('./tests/actions/FunctionCreate');
+  require('./tests/actions/EnvList');
+  require('./tests/actions/EnvGet');
+  require('./tests/actions/EnvSetUnset');
+  require('./tests/actions/ResourcesDeploy');
   require('./tests/actions/FunctionRun');
   //require('./tests/actions/FunctionDeploy');
   //require('./tests/actions/EndpointDeploy');
diff --git a/tests/tests/classes/ServerlessStateTest.js b/tests/tests/classes/ServerlessStateTest.js
index 89d600099..43e087a38 100644
--- a/tests/tests/classes/ServerlessStateTest.js
+++ b/tests/tests/classes/ServerlessStateTest.js
@@ -5,11 +5,11 @@
  */
 
 let Serverless = require('../../../lib/Serverless.js'),
-  path         = require('path'),
-  utils        = require('../../../lib/utils/index'),
-  assert       = require('chai').assert,
-  testUtils    = require('../../test_utils'),
-  config       = require('../../config');
+    path         = require('path'),
+    utils        = require('../../../lib/utils/index'),
+    assert       = require('chai').assert,
+    testUtils    = require('../../test_utils'),
+    config       = require('../../config');
 
 let serverless;
 let instance;
@@ -19,25 +19,25 @@ describe('Test Serverless State Class', function() {
   before(function(done) {
     this.timeout(0);
     testUtils.createTestProject(config)
-      .then(projPath => {
+        .then(projPath => {
 
-        process.chdir(projPath);
+          process.chdir(projPath);
 
-        // Instantiate Serverless
-        serverless = new Serverless({
-          interactive: false,
-          projectPath: projPath
-        });
-
-        return serverless.init()
-          .then(function() {
-
-            // Instantiate Class
-            instance = new serverless.classes.State(serverless);
-
-            done();
+          // Instantiate Serverless
+          serverless = new Serverless({
+            interactive: false,
+            projectPath: projPath
           });
-      });
+
+          return serverless.init()
+              .then(function() {
+
+                // Instantiate Class
+                instance = new serverless.classes.State(serverless);
+
+                done();
+              });
+        });
   });
 
   after(function(done) {
@@ -48,12 +48,12 @@ describe('Test Serverless State Class', function() {
 
     it('Load instance from file system', function(done) {
       instance.load()
-        .then(function(instance) {
-          done();
-        })
-        .catch(e => {
-          done(e);
-        });
+          .then(function(instance) {
+            done();
+          })
+          .catch(e => {
+            done(e);
+          });
     });
 
     it('Get instance data, without private properties', function(done) {
@@ -79,12 +79,12 @@ describe('Test Serverless State Class', function() {
 
     it('Save instance to the file system', function(done) {
       instance.save()
-        .then(function(instance) {
-          done();
-        })
-        .catch(e => {
-          done(e);
-        });
+          .then(function(instance) {
+            done();
+          })
+          .catch(e => {
+            done(e);
+          });
     });
 
     it('Get project', function(done) {
@@ -100,23 +100,18 @@ describe('Test Serverless State Class', function() {
     });
 
     it('Get resources (unpopulated)', function(done) {
-      let resources = instance.getResources()
-        .then(function(resources) {
-          console.log(resources)
-          assert.equal(true, JSON.stringify(resources).indexOf('${') !== -1);
-          done();
-        });
+      let resources = instance.getResources();
+      assert.equal(true, JSON.stringify(resources).indexOf('${') !== -1);
+      done();
     });
 
     it('Get resources (populated)', function(done) {
       let resources = instance.getResources({
-          populate: true, stage: config.stage, region: config.region
-        })
-        .then(function() {
-          assert.equal(true, JSON.stringify(resources).indexOf('$${') == -1);
-          assert.equal(true, JSON.stringify(resources).indexOf('${') == -1);
-          done();
-        });
+        populate: true, stage: config.stage, region: config.region
+      })
+      assert.equal(true, JSON.stringify(resources).indexOf('$${') == -1);
+      assert.equal(true, JSON.stringify(resources).indexOf('${') == -1);
+      done();
     });
 
     it('Get stages', function(done) {