Index: bitmaskTest.php
===================================================================
--- bitmaskTest.php	(revision 4061)
+++ bitmaskTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_BitmaskTest extends PHPUnit_Framework_TestCase
+class BitmaskTest extends PHPUnit_Framework_TestCase
 {
 
 	public function setup()
Index: blockTest.php
===================================================================
--- blockTest.php	(revision 4061)
+++ blockTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_BlockTest extends PHPUnit_Framework_TestCase
+class BlockTest extends PHPUnit_Framework_TestCase
 {
 	private $title = 'Test Block Title';
 	private $type = "Test Block";
Index: AllTests.php
===================================================================
--- AllTests.php	(revision 4061)
+++ AllTests.php	(working copy)
@@ -39,14 +39,14 @@
         $suite = new PHPUnit_Framework_TestSuite('PHPUnit_Framework');
 
 		// PHPEdit Tests suites -- dot not remove this comment
-		$suite->addTestSuite('system_classes_FileCacheTest');
-		$suite->addTestSuite('system_classes_RemoteRequestTest');
-		$suite->addTestSuite('system_classes_FormatTest');
-		$suite->addTestSuite('system_classes_BitmaskTest');
-		$suite->addTestSuite('system_classes_ColorUtilsTest');
-		$suite->addTestSuite('system_classes_UtilsTest');
-		$suite->addTestSuite('system_classes_UUIDTest');
-		$suite->addTestSuite('system_classes_TagTest');
+		$suite->addTestSuite('FileCacheTest');
+		$suite->addTestSuite('RemoteRequestTest');
+		$suite->addTestSuite('FormatTest');
+		$suite->addTestSuite('BitmaskTest');
+		$suite->addTestSuite('ColorUtilsTest');
+		$suite->addTestSuite('UtilsTest');
+		$suite->addTestSuite('UUIDTest');
+		$suite->addTestSuite('TagTest');
 		// /PHPEdit Tests suites -- dot not remove this comment
 
         return $suite;
Index: aclTest.php
===================================================================
--- aclTest.php	(revision 4061)
+++ aclTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_aclTest extends PHPUnit_Framework_TestCase
+class aclTest extends PHPUnit_Framework_TestCase
 {
 	private $acl_group;
 	private $acl_user_alice;
Index: colorUtilsTest.php
===================================================================
--- colorUtilsTest.php	(revision 4061)
+++ colorUtilsTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_ColorUtilsTest extends PHPUnit_Framework_TestCase
+class ColorUtilsTest extends PHPUnit_Framework_TestCase
 {
 
 	function setup()
Index: utilsTest.php
===================================================================
--- utilsTest.php	(revision 4061)
+++ utilsTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_UtilsTest extends PHPUnit_Framework_TestCase
+class UtilsTest extends PHPUnit_Framework_TestCase
 {
 	function setup()
 	{
Index: commentTest.php
===================================================================
--- commentTest.php	(revision 4061)
+++ commentTest.php	(working copy)
@@ -5,7 +5,7 @@
 /**
  * Test class for Comment.
  */
-class system_classes_CommentTest extends PHPUnit_Framework_TestCase
+class CommentTest extends PHPUnit_Framework_TestCase
 {
 	/**
 	 * @var    Comment
Index: filecacheTest.php
===================================================================
--- filecacheTest.php	(revision 4061)
+++ filecacheTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_FileCacheTest extends PHPUnit_Framework_TestCase
+class FileCacheTest extends PHPUnit_Framework_TestCase
 {
 	
 	protected function setUp()
Index: queryrecordTest.php
===================================================================
--- queryrecordTest.php	(revision 4061)
+++ queryrecordTest.php	(working copy)
@@ -20,7 +20,7 @@
 /**
  * Test class for Comment.
  */
-class system_classes_QueryRecordTest extends PHPUnit_Framework_TestCase
+class QueryRecordTest extends PHPUnit_Framework_TestCase
 {
 	protected $queryrecord;
 	protected $test_data = array(
Index: remoterequestTest.php
===================================================================
--- remoterequestTest.php	(revision 4061)
+++ remoterequestTest.php	(working copy)
@@ -1,7 +1,7 @@
 <?php
 
 
-class system_classes_RemoteRequestTest extends PHPUnit_Framework_TestCase
+class RemoteRequestTest extends PHPUnit_Framework_TestCase
 {
 
 	public function test__set_processor()
Index: uuidTest.php
===================================================================
--- uuidTest.php	(revision 4061)
+++ uuidTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_UUIDTest extends PHPUnit_Framework_TestCase
+class UUIDTest extends PHPUnit_Framework_TestCase
 {
 
 	public function test__toString()
Index: postsTest.php
===================================================================
--- postsTest.php	(revision 4061)
+++ postsTest.php	(working copy)
@@ -4,7 +4,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_PostsTest extends PHPUnit_Framework_TestCase
+class PostsTest extends PHPUnit_Framework_TestCase
 {
 	protected $posts;
 
Index: tagTest.php
===================================================================
--- tagTest.php	(revision 4061)
+++ tagTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_TagTest extends PHPUnit_Framework_TestCase
+class TagTest extends PHPUnit_Framework_TestCase
 {
 	private $text = 'Test Tag';
 	private $slug;
Index: taxonomyTest.php
===================================================================
--- taxonomyTest.php	(revision 4061)
+++ taxonomyTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_TaxonomyTest extends PHPUnit_Framework_TestCase
+class TaxonomyTest extends PHPUnit_Framework_TestCase
 {
 	private $vocab_name;
 	private $vocab_desc;
Index: apccacheTest.php
===================================================================
--- apccacheTest.php	(revision 4061)
+++ apccacheTest.php	(working copy)
@@ -3,7 +3,7 @@
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 require_once 'filecacheTest.php';
 
-class system_classes_APCCacheTest extends system_classes_FileCacheTest
+class APCCacheTest extends system_classes_FileCacheTest
 {
 	protected function setUp()
 	{
Index: formatTest.php
===================================================================
--- formatTest.php	(revision 4061)
+++ formatTest.php	(working copy)
@@ -2,7 +2,7 @@
 
 require_once dirname( dirname( dirname( __FILE__ ) ) ) . DIRECTORY_SEPARATOR . 'phpunit_bootstrap.php';
 
-class system_classes_FormatTest extends PHPUnit_Framework_TestCase
+class FormatTest extends PHPUnit_Framework_TestCase
 {
 
 	public function testSimpleAutop()