diff --git a/composer.json b/composer.json
index 907a7dc30..333165ec8 100644
--- a/composer.json
+++ b/composer.json
@@ -25,15 +25,12 @@
     "require": {
         "php": ">=5.4",
         "laravel/framework": "4.2.*",
-        "october/system": "dev-master",
-        "october/backend": "dev-master",
-        "october/cms": "dev-master",
-        "october/rain": "dev-master"
+        "october/system": "~1.0",
+        "october/backend": "~1.0",
+        "october/cms": "~1.0",
+        "october/rain": "~1.0"
     },
-    "require-dev": {
-        "mockery/mockery": "dev-master"
-    },
-    "autoload": {
+    "autoload-dev": {
         "classmap": [
             "tests/TestCase.php",
             "tests/UiTestCase.php"
diff --git a/modules/backend/composer.json b/modules/backend/composer.json
index eff997b07..32560e89c 100644
--- a/modules/backend/composer.json
+++ b/modules/backend/composer.json
@@ -16,19 +16,19 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "october/rain": "dev-master",
-        "composer/installers": "~1.0"
+        "php": ">=5.4.0",
+        "composer/installers": "~1.0",
+        "october/rain": "~1.0"
     },
     "autoload": {
         "psr-0": {
             "Backend": ""
         }
     },
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.0-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }
diff --git a/modules/cms/composer.json b/modules/cms/composer.json
index 96593ba22..608865aac 100644
--- a/modules/cms/composer.json
+++ b/modules/cms/composer.json
@@ -16,19 +16,19 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "october/rain": "dev-master",
-        "composer/installers": "~1.0"
+        "php": ">=5.4.0",
+        "composer/installers": "~1.0",
+        "october/rain": "~1.0"
     },
     "autoload": {
         "psr-0": {
             "Cms": ""
         }
     },
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.0-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }
diff --git a/modules/system/composer.json b/modules/system/composer.json
index 141d96b52..68275400f 100644
--- a/modules/system/composer.json
+++ b/modules/system/composer.json
@@ -16,19 +16,19 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "october/rain": "dev-master",
-        "composer/installers": "~1.0"
+        "php": ">=5.4.0",
+        "composer/installers": "~1.0",
+        "october/rain": "~1.0"
     },
     "autoload": {
         "psr-0": {
             "System": ""
         }
     },
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.0-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }
diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index cae7f33d3..34d06f5a4 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -5,11 +5,6 @@ use Cms\Classes\Theme;
 
 class ControllerTest extends TestCase
 {
-    public function tearDown()
-    {
-        Mockery::close();
-    }
-
     public function test404()
     {
         /*
@@ -152,7 +147,7 @@ class ControllerTest extends TestCase
             with($this->stringContains('X_OCTOBER_REQUEST_HANDLER'), $this->anything())->
             will($this->returnValue($handler));
 
-        if ($partials !== false) 
+        if ($partials !== false)
             $requestMock->expects($this->at(1))->
                 method('header')->
                 with($this->stringContains('X_OCTOBER_REQUEST_PARTIALS'), $this->anything())->
@@ -316,7 +311,7 @@ ESC;
 
         $this->assertArrayHasKey('firstAlias', $page->components);
         $this->assertArrayHasKey('secondAlias', $page->components);
-        
+
         $component = $page->components['firstAlias'];
         $component2 = $page->components['secondAlias'];