diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index 7c8e9d468c..0e7d7d813c 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -26,9 +26,6 @@ class UserController extends BaseController
      */
     public function login()
     {
-
-
-
         return View::make('user.login');
     }
 
diff --git a/app/tests/controllers/ChartControllerTest.php b/app/tests/controllers/ChartControllerTest.php
index 4192dc9603..1b915d0377 100644
--- a/app/tests/controllers/ChartControllerTest.php
+++ b/app/tests/controllers/ChartControllerTest.php
@@ -168,4 +168,8 @@ class ChartControllerTest extends TestCase
         // test
         $this->assertResponseOk();
     }
+    public function tearDown()
+    {
+        Mockery::close();
+    }
 }
\ No newline at end of file
diff --git a/app/tests/controllers/JsonControllerTest.php b/app/tests/controllers/JsonControllerTest.php
index 3ddac24187..dc83780976 100644
--- a/app/tests/controllers/JsonControllerTest.php
+++ b/app/tests/controllers/JsonControllerTest.php
@@ -35,5 +35,8 @@ class JsonControllerTest extends TestCase {
         // test
         $this->assertResponseOk();
     }
-
+    public function tearDown()
+    {
+        Mockery::close();
+    }
 } 
\ No newline at end of file
diff --git a/app/tests/controllers/PreferencesControllerTest.php b/app/tests/controllers/PreferencesControllerTest.php
index 7d1b3110a1..e644905635 100644
--- a/app/tests/controllers/PreferencesControllerTest.php
+++ b/app/tests/controllers/PreferencesControllerTest.php
@@ -57,4 +57,8 @@ class PreferencesControllerTest extends TestCase
         $this->assertSessionHas('success');
         $this->assertRedirectedToRoute('preferences');
     }
+    public function tearDown()
+    {
+        Mockery::close();
+    }
 } 
\ No newline at end of file
diff --git a/app/tests/controllers/TransactionControllerTest.php b/app/tests/controllers/TransactionControllerTest.php
index 130393d55d..92871f6842 100644
--- a/app/tests/controllers/TransactionControllerTest.php
+++ b/app/tests/controllers/TransactionControllerTest.php
@@ -90,7 +90,7 @@ class TransactionControllerTest extends TestCase
         $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
         $tj->shouldReceive('createSimpleJournal')->once()->andReturn($journal);
 
-        $tj->shouldReceive('createSimpleJournal')->with($account, $beneficiary, $data['description'], $data['amount'], new \Carbon\Carbon($data['date']))->once()->andReturn($journal);
+//        $tj->shouldReceive('createSimpleJournal')->with($account, $beneficiary, $data['description'], $data['amount'], new \Carbon\Carbon($data['date']))->once()->andReturn($journal);
 
         // call
         $this->call('POST', '/transactions/add/withdrawal', $data);
@@ -98,5 +98,8 @@ class TransactionControllerTest extends TestCase
         // test
         $this->assertRedirectedToRoute('index');
     }
-
+    public function tearDown()
+    {
+        Mockery::close();
+    }
 } 
\ No newline at end of file
diff --git a/app/tests/models/AllModelsTest.php b/app/tests/models/AllModelsTest.php
index cdca1cb7e6..a98e11e2e1 100644
--- a/app/tests/models/AllModelsTest.php
+++ b/app/tests/models/AllModelsTest.php
@@ -193,5 +193,8 @@ class AllModelsTest extends TestCase
         $this->assertCount(1, $component->user()->get());
         $this->assertCount(1, $component->transactions()->get());
     }
-
+    public function tearDown()
+    {
+        Mockery::close();
+    }
 }
\ No newline at end of file