diff --git a/app/lib/Firefly/Helper/Controllers/Budget.php b/app/lib/Firefly/Helper/Controllers/Budget.php
index d2a9884718..4cab145e0f 100644
--- a/app/lib/Firefly/Helper/Controllers/Budget.php
+++ b/app/lib/Firefly/Helper/Controllers/Budget.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 27/07/14
- * Time: 16:28
- */
 
 namespace Firefly\Helper\Controllers;
 
diff --git a/app/lib/Firefly/Helper/Controllers/Category.php b/app/lib/Firefly/Helper/Controllers/Category.php
index 0b3444ce87..bed42fcc56 100644
--- a/app/lib/Firefly/Helper/Controllers/Category.php
+++ b/app/lib/Firefly/Helper/Controllers/Category.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: User
- * Date: 30-7-14
- * Time: 10:57
- */
 
 namespace Firefly\Helper\Controllers;
 
diff --git a/app/lib/Firefly/Helper/Controllers/CategoryInterface.php b/app/lib/Firefly/Helper/Controllers/CategoryInterface.php
index f858f301b9..aef9c81717 100644
--- a/app/lib/Firefly/Helper/Controllers/CategoryInterface.php
+++ b/app/lib/Firefly/Helper/Controllers/CategoryInterface.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: User
- * Date: 30-7-14
- * Time: 10:57
- */
 
 namespace Firefly\Helper\Controllers;
 
diff --git a/app/lib/Firefly/Helper/Controllers/Chart.php b/app/lib/Firefly/Helper/Controllers/Chart.php
index c08b4f9f2e..b90affa273 100644
--- a/app/lib/Firefly/Helper/Controllers/Chart.php
+++ b/app/lib/Firefly/Helper/Controllers/Chart.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: User
- * Date: 29-7-14
- * Time: 10:41
- */
 
 namespace Firefly\Helper\Controllers;
 
diff --git a/app/lib/Firefly/Helper/Controllers/ChartInterface.php b/app/lib/Firefly/Helper/Controllers/ChartInterface.php
index c5e9f9e1bb..3ef029475c 100644
--- a/app/lib/Firefly/Helper/Controllers/ChartInterface.php
+++ b/app/lib/Firefly/Helper/Controllers/ChartInterface.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: User
- * Date: 29-7-14
- * Time: 10:42
- */
 
 namespace Firefly\Helper\Controllers;
 
diff --git a/app/lib/Firefly/Helper/Form/FormTrigger.php b/app/lib/Firefly/Helper/Form/FormTrigger.php
index 16e3636bfd..07b8ace267 100644
--- a/app/lib/Firefly/Helper/Form/FormTrigger.php
+++ b/app/lib/Firefly/Helper/Form/FormTrigger.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 25/07/14
- * Time: 21:04
- */
 
 namespace Firefly\Helper\Form;
 
diff --git a/app/tests/controllers/JsonControllerTest.php b/app/tests/controllers/JsonControllerTest.php
new file mode 100644
index 0000000000..1949d2516d
--- /dev/null
+++ b/app/tests/controllers/JsonControllerTest.php
@@ -0,0 +1,41 @@
+<?php
+use Zizaco\FactoryMuff\Facade\FactoryMuff as f;
+/**
+ * Class JsonControllerTest
+ */
+class JsonControllerTest extends TestCase
+{
+    protected $_accounts;
+    protected $_categories;
+
+    public function setUp()
+    {
+        parent::setUp();
+        Artisan::call('migrate');
+        Artisan::call('db:seed');
+        $this->_accounts = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface');
+        $this->_categories = $this->mock('Firefly\Storage\Category\CategoryRepositoryInterface');
+    }
+
+    public function tearDown()
+    {
+        Mockery::close();
+    }
+
+    public function testBeneficiaries()
+    {
+        $beneficiary = f::create('Account');
+
+        $this->_accounts->shouldReceive('getBeneficiaries')->once()->andReturn([$beneficiary]);
+        $this->action('GET', 'JsonController@beneficiaries');
+        $this->assertResponseOk();
+    }
+
+    public function testCategories()
+    {
+        $category = f::create('Category');
+        $this->_categories->shouldReceive('get')->once()->andReturn([$category]);
+        $this->action('GET', 'JsonController@categories');
+        $this->assertResponseOk();
+    }
+} 
\ No newline at end of file