diff --git a/.cake_task_cache b/.cake_task_cache
new file mode 100644
index 0000000..e69de29
diff --git a/easy-bake-config.yml b/easy-bake-config.yml
index 29fc520..605c645 100644
--- a/easy-bake-config.yml
+++ b/easy-bake-config.yml
@@ -40,4 +40,4 @@ tests:
 postinstall:
   copy_latest_underscore_for_subscriptions:
     command: 'cp'
-    args: ['underscore', 'test/mixin-subscriptions/vendor/underscore-latest.js']
\ No newline at end of file
+    args: ['underscore', 'vendor/underscore-latest.js']
\ No newline at end of file
diff --git a/package.json b/package.json
index da589dd..a225977 100644
--- a/package.json
+++ b/package.json
@@ -12,12 +12,11 @@
   },
 
   "scripts": {
-  "postinstall": "node_modules/.bin/cake postinstall",
-    "test": "node_modules/.bin/cake -c -b test"
+    "preinstall": "npm install coffee-script; npm install easy-bake@0.1.2",
+    "postinstall": "cake postinstall",
+    "test": "cake -c -b test"
   },
-  "devDependencies": {
-    "coffee-script": "latest",
-    "easy-bake": "0.1.2",
+  "optionalDependencies": {
     "underscore": "latest"
   },
 
diff --git a/test/integration-auto-unmix/test.min.html b/test/integration-auto-unmix/test.min.html
index f55b500..f4e3cf1 100644
--- a/test/integration-auto-unmix/test.min.html
+++ b/test/integration-auto-unmix/test.min.html
@@ -7,7 +7,7 @@
   <script type="text/javascript" src="../vendor/qunit/qunit.js"></script>
   <script type="text/javascript" src="../vendor/qunit/jslitmus.js"></script>
 
-  <script type="text/javascript" src="../../mixin.min.js"></script>
+  <script type="text/javascript" src="../../mixin-js.min.js"></script>
   <script type="text/javascript">Mixin.DEBUG=false;</script>
 
   <script type="text/javascript" src="build/test.js"></script>
diff --git a/test/mixin-subscriptions/test.html b/test/mixin-subscriptions/test.html
index a5a7b57..db33cb1 100644
--- a/test/mixin-subscriptions/test.html
+++ b/test/mixin-subscriptions/test.html
@@ -7,7 +7,7 @@
   <script type="text/javascript" src="../vendor/qunit/qunit.js"></script>
   <script type="text/javascript" src="../vendor/qunit/jslitmus.js"></script>
 
-  <script type="text/javascript" src="vendor/underscore-latest.js"></script>
+  <script type="text/javascript" src="../../vendor/underscore-latest.js"></script>
 
   <script type="text/javascript" src="../../mixin-js-core.js"></script>
   <script type="text/javascript">Mixin.DEBUG=true;</script>
diff --git a/test/mixin-subscriptions/test.min.html b/test/mixin-subscriptions/test.min.html
index 021ab2d..edf608e 100644
--- a/test/mixin-subscriptions/test.min.html
+++ b/test/mixin-subscriptions/test.min.html
@@ -7,7 +7,7 @@
   <script type="text/javascript" src="../vendor/qunit/qunit.js"></script>
   <script type="text/javascript" src="../vendor/qunit/jslitmus.js"></script>
 
-  <script type="text/javascript" src="vendor/underscore-latest.js"></script>
+  <script type="text/javascript" src="../../vendor/underscore-latest.js"></script>
 
   <script type="text/javascript" src="../../mixin-js-core.min.js"></script>
   <script type="text/javascript">Mixin.DEBUG=true;</script>
diff --git a/test/packaging/test-unbundled.html b/test/packaging/test-unbundled.html
index 9f79055..3791ba2 100644
--- a/test/packaging/test-unbundled.html
+++ b/test/packaging/test-unbundled.html
@@ -41,7 +41,7 @@
   </script>
   <script type="text/javascript" src="../mixin-ref-count/build/test.js"></script>
 
-  <script type="text/javascript" src="../mixin-subscriptions/vendor/underscore-latest.js"></script>
+  <script type="text/javascript" src="../../vendor/underscore-latest.js"></script>
   <script type="text/javascript">
     window.mock_requires['underscore'] = window['exports']; delete window['exports']; delete window['_'];
     window.exports = {};
diff --git a/test/mixin-subscriptions/vendor/underscore-latest.js b/vendor/underscore-latest.js
similarity index 100%
rename from test/mixin-subscriptions/vendor/underscore-latest.js
rename to vendor/underscore-latest.js