diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index e80e05f..8aba8f8 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -42,7 +42,6 @@ public function publicPropertiesThatShouldExist()
             ['groups'],
             ['tickets'],
             ['conversations'],
-            ['categories'],
             ['forums'],
             ['topics'],
             ['comments'],
diff --git a/tests/Resources/AgentTest.php b/tests/Resources/AgentTest.php
index 72201ca..88b232b 100644
--- a/tests/Resources/AgentTest.php
+++ b/tests/Resources/AgentTest.php
@@ -22,6 +22,7 @@ public function methodsThatShouldExist()
         return [
             ['all'],
             ['view'],
+            ['create'],
             ['current'],
         ];
     }
diff --git a/tests/Resources/ArticleTest.php b/tests/Resources/ArticleTest.php
new file mode 100644
index 0000000..898c2e8
--- /dev/null
+++ b/tests/Resources/ArticleTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Freshdesk\tests\Resources;
+
+use Freshdesk\Resources\Article;
+use Freshdesk\tests\TestCase;
+
+/**
+ * Article resource tests
+ *
+ */
+class ArticleTest extends TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->class = Article::class;
+    }
+
+    public function methodsThatShouldExist()
+    {
+        return [
+            ['create'],
+            ['view'],
+            ['update'],
+            ['delete'],
+        ];
+    }
+}
diff --git a/tests/Resources/CompanyTest.php b/tests/Resources/CompanyTest.php
index 45df28b..b6ce9e1 100644
--- a/tests/Resources/CompanyTest.php
+++ b/tests/Resources/CompanyTest.php
@@ -10,7 +10,7 @@
  *
  * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class CompanyApiTest extends TestCase
+class CompanyTest extends TestCase
 {
     public function setUp()
     {
diff --git a/tests/Resources/ContactTest.php b/tests/Resources/ContactTest.php
index e347721..e824157 100644
--- a/tests/Resources/ContactTest.php
+++ b/tests/Resources/ContactTest.php
@@ -9,7 +9,7 @@
  *
  * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class ContactApiTest extends TestCase
+class ContactTest extends TestCase
 {
 
     public function setUp()
diff --git a/tests/Resources/CategoryTest.php b/tests/Resources/DiscussionTest.php
similarity index 65%
rename from tests/Resources/CategoryTest.php
rename to tests/Resources/DiscussionTest.php
index e7d64bf..2f76ee7 100644
--- a/tests/Resources/CategoryTest.php
+++ b/tests/Resources/DiscussionTest.php
@@ -1,28 +1,27 @@
 <?php
+
 namespace Freshdesk\tests\Resources;
 
-use Freshdesk\Resources\Category;
+use Freshdesk\Resources\Discussion;
 use Freshdesk\tests\TestCase;
 
 /**
- * Category resource tests
+ * Discussion resource tests
  *
- * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class CategoryTest extends TestCase
+class DiscussionTest extends TestCase
 {
     public function setUp()
     {
         parent::setUp();
-
-        $this->class = Category::class;
+        $this->class = Discussion::class;
     }
 
     public function methodsThatShouldExist()
     {
         return [
-            ['create'],
             ['all'],
+            ['create'],
             ['view'],
             ['update'],
             ['delete'],
diff --git a/tests/Resources/FolderTest.php b/tests/Resources/FolderTest.php
new file mode 100644
index 0000000..677c577
--- /dev/null
+++ b/tests/Resources/FolderTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Freshdesk\tests\Resources;
+
+use Freshdesk\Resources\Folder;
+use Freshdesk\tests\TestCase;
+
+/**
+ * Folder resource tests
+ *
+ */
+class FolderTest extends TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->class = Folder::class;
+    }
+
+    public function methodsThatShouldExist()
+    {
+        return [
+            ['forCategory'],
+            ['view'],
+            ['update'],
+            ['delete'],
+        ];
+    }
+}
diff --git a/tests/Resources/GroupTest.php b/tests/Resources/GroupTest.php
index fa5e20f..ccbb08e 100644
--- a/tests/Resources/GroupTest.php
+++ b/tests/Resources/GroupTest.php
@@ -9,7 +9,7 @@
  *
  * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class GroupApiTest extends TestCase
+class GroupTest extends TestCase
 {
     public function setUp()
     {
diff --git a/tests/Resources/SLAPolicyTest.php b/tests/Resources/SLAPolicyTest.php
index 2a5eb72..22794cc 100644
--- a/tests/Resources/SLAPolicyTest.php
+++ b/tests/Resources/SLAPolicyTest.php
@@ -9,7 +9,7 @@
  *
  * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class SLAPolicytest extends TestCase
+class SLAPolicyTest extends TestCase
 {
     public function setUp()
     {
diff --git a/tests/Resources/SolutionTest.php b/tests/Resources/SolutionTest.php
new file mode 100644
index 0000000..3741b1b
--- /dev/null
+++ b/tests/Resources/SolutionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Freshdesk\tests\Resources;
+
+use Freshdesk\Resources\Solution;
+use Freshdesk\tests\TestCase;
+
+/**
+ * Solution resource tests
+ *
+ */
+class SolutionTest extends TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->class = Solution::class;
+    }
+
+    public function methodsThatShouldExist()
+    {
+        return [
+            ['all'],
+            ['create'],
+            ['view'],
+            ['update'],
+            ['delete'],
+        ];
+    }
+}
diff --git a/tests/Resources/TicketTest.php b/tests/Resources/TicketTest.php
index d64f2b7..f825384 100644
--- a/tests/Resources/TicketTest.php
+++ b/tests/Resources/TicketTest.php
@@ -9,7 +9,7 @@
  *
  * @author Matthew Clarkson <mpclarkson@gmail.com>
  */
-class TicketApiTest extends TestCase
+class TicketTest extends TestCase
 {
     public function setUp()
     {