diff --git a/lib/actions/ComponentCreate.js b/lib/actions/ComponentCreate.js
index c1bea73a5..7dc3597d0 100644
--- a/lib/actions/ComponentCreate.js
+++ b/lib/actions/ComponentCreate.js
@@ -203,11 +203,9 @@ usage: serverless component create`,
         module:    this.evt.options.module,
         runtime:   this.evt.options.runtime
       });
+
       this.S.state.setAsset(component);
-
-
-      //return component.save();
-      return BbPromise.resolve()
+      return component.save();
     };
 
     /**
diff --git a/lib/actions/FunctionCreate.js b/lib/actions/FunctionCreate.js
index a342d004e..eba99a4b0 100644
--- a/lib/actions/FunctionCreate.js
+++ b/lib/actions/FunctionCreate.js
@@ -191,7 +191,6 @@ usage: serverless function create <function>`,
       return BbPromise.resolve();
     };
 
-
     /**
      * Create Function Skeleton
      */
@@ -205,6 +204,7 @@ usage: serverless function create <function>`,
         function:   this.evt.options.function
       });
 
+      this.S.state.setAsset(func);
       return func.save();
     };
   }
diff --git a/lib/actions/ModuleCreate.js b/lib/actions/ModuleCreate.js
index 0732024b5..8d52b0b32 100644
--- a/lib/actions/ModuleCreate.js
+++ b/lib/actions/ModuleCreate.js
@@ -209,6 +209,7 @@ usage: serverless module create`,
         runtime:   this.evt.options.runtime
       });
 
+      this.S.state.setAsset(module);
       return module.save();
 
     };
diff --git a/tests/all.js b/tests/all.js
index f8c1649fa..0282c3447 100644
--- a/tests/all.js
+++ b/tests/all.js
@@ -20,9 +20,9 @@ describe('All Tests', function() {
   //require('./tests/actions/TestDefaultActionHook');
   //require('./tests/actions/StageCreate');
   //require('./tests/actions/RegionCreate');
-  //require('./tests/actions/ComponentCreate');
-  //require('./tests/actions/ModuleCreate');
-  //require('./tests/actions/FunctionCreate');
+  require('./tests/actions/ComponentCreate');
+  require('./tests/actions/ModuleCreate');
+  require('./tests/actions/FunctionCreate');
   //require('./tests/actions/EnvList');
   //require('./tests/actions/EnvGet');
   //require('./tests/actions/EnvSetUnset');