diff --git a/classes/ComicPressStorylineCategory.inc b/classes/ComicPressStorylineCategory.inc
deleted file mode 100644
index 500c9fc..0000000
--- a/classes/ComicPressStorylineCategory.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class ComicPressStorylineCategory {
-  
-}
-
-?>
\ No newline at end of file
diff --git a/test/ComicPressAdminTest.php b/test/ComicPressAdminTest.php
index bd1756e..ff309eb 100644
--- a/test/ComicPressAdminTest.php
+++ b/test/ComicPressAdminTest.php
@@ -2,7 +2,7 @@
 
 require_once('PHPUnit/Framework.php');
 require_once('MockPress/mockpress.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressAdmin.inc');
+require_once('ComicPressAdmin.inc');
 
 class ComicPressAdminTest extends PHPUnit_Framework_TestCase {
   function setUp() {
diff --git a/test/ComicPressComicPostTest.php b/test/ComicPressComicPostTest.php
index 1ba24a8..ce04737 100644
--- a/test/ComicPressComicPostTest.php
+++ b/test/ComicPressComicPostTest.php
@@ -2,7 +2,7 @@
 
 require_once('PHPUnit/Framework.php');
 require_once('MockPress/mockpress.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressComicPost.inc');
+require_once('ComicPressComicPost.inc');
 
 class ComicPressComicPostTest extends PHPUnit_Framework_TestCase {
   function setUp() {
diff --git a/test/ComicPressDBInterfaceTest.php b/test/ComicPressDBInterfaceTest.php
index e6dd5b2..2c7dc1e 100644
--- a/test/ComicPressDBInterfaceTest.php
+++ b/test/ComicPressDBInterfaceTest.php
@@ -2,7 +2,7 @@
 
 require_once('MockPress/mockpress.php');
 require_once('PHPUnit/Framework.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressDBInterface.inc');
+require_once('ComicPressDBInterface.inc');
 
 class ComicPressDBInterfaceTest extends PHPUnit_Framework_TestCase {
   function testSingleton() {
diff --git a/test/ComicPressNavigationTest.php b/test/ComicPressNavigationTest.php
index a45c6ff..e848ec8 100644
--- a/test/ComicPressNavigationTest.php
+++ b/test/ComicPressNavigationTest.php
@@ -2,7 +2,7 @@
 
 require_once('MockPress/mockpress.php');
 require_once('PHPUnit/Framework.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressNavigation.inc');
+require_once('ComicPressNavigation.inc');
 
 /**
  * Integration Testing. Just make sure things are called correctly.
diff --git a/test/ComicPressStorylineCategoryTest.php b/test/ComicPressStorylineCategoryTest.php
deleted file mode 100644
index c448e6a..0000000
--- a/test/ComicPressStorylineCategoryTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require_once('MockPress/mockpress.php');
-require_once('PHPUnit/Framework.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressStorylineCategory.inc');
-
-class ComicPressStorylineCategoryTest extends PHPUnit_Framework_TestCase {
-  function setUp() {
-    _reset_wp();
-  }
-  
-  function testGetAdjacentCategories() {
-    $sc = new ComicPressStorylineCategory();
-  }
-}
-
-?>
\ No newline at end of file
diff --git a/test/ComicPressStorylineTest.php b/test/ComicPressStorylineTest.php
index 6b05021..d4b8ddf 100644
--- a/test/ComicPressStorylineTest.php
+++ b/test/ComicPressStorylineTest.php
@@ -2,7 +2,7 @@
 
 require_once('MockPress/mockpress.php');
 require_once('PHPUnit/Framework.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPressStoryline.inc');
+require_once('ComicPressStoryline.inc');
 
 class ComicPressStorylineTest extends PHPUnit_Framework_TestCase {
   function setUp() {
diff --git a/test/ComicPressTest.php b/test/ComicPressTest.php
index e0de19e..e78aa6c 100644
--- a/test/ComicPressTest.php
+++ b/test/ComicPressTest.php
@@ -2,7 +2,7 @@
 
 require_once('PHPUnit/Framework.php');
 require_once('MockPress/mockpress.php');
-require_once(dirname(__FILE__) . '/../classes/ComicPress.inc');
+require_once('ComicPress.inc');
 
 class ComicPressTest extends PHPUnit_Framework_TestCase {
   function setUp() {