diff --git a/tests/Export/FirebirdTestCase.php b/tests/Export/FirebirdTestCase.php
new file mode 100644
index 000000000..ca9a80fd4
--- /dev/null
+++ b/tests/Export/FirebirdTestCase.php
@@ -0,0 +1,56 @@
+<?php
+class Doctrine_Export_Firebird_TestCase extends Doctrine_UnitTestCase {
+    public function testCreateDatabaseDoesNotExecuteSql() {
+        try {
+            $this->export->createDatabase('db');
+            $this->fail();
+        } catch(Doctrine_Export_Firebird_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testDropDatabaseDoesNotExecuteSql() {
+        try {
+            $this->export->dropDatabase('db');
+            $this->fail();
+        } catch(Doctrine_Export_Firebird_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableSupportsAutoincPks() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TRIGGER mytable_AUTOINCREMENT_PK FOR mytable
+                        ACTIVE BEFORE INSERT POSITION 0
+                        AS
+                        BEGIN
+                        IF (NEW.id IS NULL OR NEW.id = 0) THEN
+                            NEW.id = GEN_ID(mytable_seq, 1);
+                        END');
+    }
+    public function testCreateTableSupportsDefaultAttribute() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INT DEFAULT 12, PRIMARY KEY(name, type))');
+    }
+    public function testCreateTableSupportsMultiplePks() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type INT, PRIMARY KEY(name, type))');
+    }
+}
+?>
diff --git a/tests/Export/InformixTestCase.php b/tests/Export/InformixTestCase.php
new file mode 100644
index 000000000..a35d0c4d9
--- /dev/null
+++ b/tests/Export/InformixTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Export_Informix_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Informix_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/tests/Export/MssqlTestCase.php b/tests/Export/MssqlTestCase.php
new file mode 100644
index 000000000..5ed6be1fd
--- /dev/null
+++ b/tests/Export/MssqlTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Export_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Mssql_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/tests/Export/MysqlTestCase.php b/tests/Export/MysqlTestCase.php
new file mode 100644
index 000000000..a100bbc84
--- /dev/null
+++ b/tests/Export/MysqlTestCase.php
@@ -0,0 +1,145 @@
+<?php
+class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
+    public function __construct() {
+        parent::__construct('mysql');
+    }
+
+    public function testAlterTableThrowsExceptionWithoutValidTableName() {
+        try {
+            $this->export->alterTable(0, array(), array());
+
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableExecutesSql() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsDefaultTableType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
+
+        $this->export->createTable($name, $fields);
+
+        // INNODB is the default type
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsMultiplePks() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type MEDIUMINT, PRIMARY KEY(name, type)) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsAutoincPks() {
+        $name = 'mytable';
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+        $options = array('type' => 'INNODB');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsCharType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char', 'length' => 3));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(3)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsCharType2() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char'));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(255)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsVarcharType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'varchar', 'length' => '100'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id VARCHAR(100)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsIntegerType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'length' => '10'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id BIGINT) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsBlobType() {
+        $name = 'mytable';
+        
+        $fields  = array('content' => array('type' => 'blob'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content LONGBLOB) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsBlobType2() {
+        $name = 'mytable';
+        
+        $fields  = array('content' => array('type' => 'blob', 'length' => 2000));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content BLOB) ENGINE = MYISAM');
+    }
+
+    public function testCreateTableSupportsBooleanType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'boolean'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id TINYINT(1)) ENGINE = MYISAM');
+    }
+    public function testCreateDatabaseExecutesSql() {
+        $this->export->createDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
+    }
+    public function testDropDatabaseExecutesSql() {
+        $this->export->dropDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
+    }
+
+    public function testDropIndexExecutesSql() {
+        $this->export->dropIndex('sometable', 'relevancy');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP INDEX relevancy_idx ON sometable');
+    }
+
+}
+?>
diff --git a/tests/Export/OracleTestCase.php b/tests/Export/OracleTestCase.php
new file mode 100644
index 000000000..f395efcca
--- /dev/null
+++ b/tests/Export/OracleTestCase.php
@@ -0,0 +1,88 @@
+<?php
+class Doctrine_Export_Oracle_TestCase extends Doctrine_UnitTestCase {
+    public function testCreateSequenceExecutesSql() {
+        $sequenceName = 'sequence';
+        $start = 1;
+        $query = 'CREATE SEQUENCE ' . $sequenceName . '_seq START WITH ' . $start . ' INCREMENT BY 1 NOCACHE';
+
+        $this->export->createSequence($sequenceName, $start);
+        
+        $this->assertEqual($this->adapter->pop(), $query);
+    }
+
+    public function testDropSequenceExecutesSql() {
+        $sequenceName = 'sequence';
+
+        $query = 'DROP SEQUENCE ' . $sequenceName;
+
+        $this->export->dropSequence($sequenceName);
+        
+        $this->assertEqual($this->adapter->pop(), $query . '_seq');
+    }
+    public function testCreateTableExecutesSql() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer'));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT)');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    public function testCreateTableSupportsDefaultAttribute() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type NUMBER(3) DEFAULT 12, PRIMARY KEY(name, type))');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    public function testCreateTableSupportsMultiplePks() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type NUMBER(3), PRIMARY KEY(name, type))');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    public function testCreateTableSupportsAutoincPks() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'autoincrement' => true));
+
+        
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual(substr($this->adapter->pop(),0, 14), 'CREATE TRIGGER');
+        $this->assertEqual($this->adapter->pop(), 'CREATE SEQUENCE MYTABLE_seq START WITH 1 INCREMENT BY 1 NOCACHE');  
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE MYTABLE ADD CONSTRAINT MYTABLE_AI_PK_idx PRIMARY KEY (id)');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT)');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+
+    public function testCreateTableSupportsCharType() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char', 'length' => 3));
+
+        $this->export->createTable($name, $fields);
+
+        $this->adapter->pop();
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(3))');
+    }
+}
+?>
diff --git a/tests/Export/PgsqlTestCase.php b/tests/Export/PgsqlTestCase.php
new file mode 100644
index 000000000..0a2f0113e
--- /dev/null
+++ b/tests/Export/PgsqlTestCase.php
@@ -0,0 +1,44 @@
+<?php
+class Doctrine_Export_Pgsql_TestCase extends Doctrine_UnitTestCase {
+    public function testCreateDatabaseExecutesSql() {
+        $this->export->createDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
+    }
+    public function testDropDatabaseExecutesSql() {
+        $this->export->dropDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
+    }
+    public function testCreateTableSupportsAutoincPks() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id SERIAL PRIMARY KEY)');
+    }
+    public function testCreateTableSupportsDefaultAttribute() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INT DEFAULT 12, PRIMARY KEY(name, type))');
+    }
+    public function testCreateTableSupportsMultiplePks() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type INT, PRIMARY KEY(name, type))');
+    }
+}
+?>
diff --git a/tests/Export/ReporterTestCase.php b/tests/Export/ReporterTestCase.php
new file mode 100644
index 000000000..862199278
--- /dev/null
+++ b/tests/Export/ReporterTestCase.php
@@ -0,0 +1,22 @@
+<?php
+class BadLyNamed__Class extends Doctrine_Record {
+    public function setTableDefinition() {
+                                         	
+    }
+    public function setUp() { }
+}
+class Doctrine_Export_Reporter_TestCase extends Doctrine_UnitTestCase {
+    public function testExportChecksClassNaming() {
+        $reporter = $this->export->export('BadLyNamed__Class');
+
+        // Class name is not valid. Double underscores are not allowed
+
+        $this->assertEqual($reporter->pop(), array(E_WARNING, 'Badly named class.'));
+    }
+    public function testExportReportsExceptions() {
+
+        $reporter = $this->export->export('User');
+        // Class name is not valid. Double underscores are not allowed
+
+    }
+}
diff --git a/tests/Export/SqliteTestCase.php b/tests/Export/SqliteTestCase.php
new file mode 100644
index 000000000..7939e8aa8
--- /dev/null
+++ b/tests/Export/SqliteTestCase.php
@@ -0,0 +1,50 @@
+<?php
+class Doctrine_Export_Sqlite_TestCase extends Doctrine_UnitTestCase {
+    public function testCreateDatabaseDoesNotExecuteSql() {
+        try {
+            $this->export->createDatabase('db');
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testDropDatabaseDoesNotExecuteSql() {
+        try {
+            $this->export->dropDatabase('db');
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableSupportsAutoincPks() {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INTEGER UNSIGNED PRIMARY KEY AUTOINCREMENT)');
+    }
+    public function testCreateTableSupportsDefaultAttribute() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INTEGER DEFAULT 12, PRIMARY KEY(name, type))');
+    }
+    public function testCreateTableSupportsMultiplePks() {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type INTEGER, PRIMARY KEY(name, type))');
+    }
+}
+?>
diff --git a/tests/Relation/AccessTestCase.php b/tests/Relation/AccessTestCase.php
index 5d52cb38f..ddcd12a49 100644
--- a/tests/Relation/AccessTestCase.php
+++ b/tests/Relation/AccessTestCase.php
@@ -1,5 +1,5 @@
 <?php
-class Doctrine_RelationAccessTestCase extends Doctrine_UnitTestCase {
+class Doctrine_Relation_Access_TestCase extends Doctrine_UnitTestCase {
     public function prepareData() {
         $o1 = new File_Owner();
         $o1->name = "owner1";
diff --git a/tests/run.php b/tests/run.php
index 83628bbfc..d35daf97d 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -20,7 +20,7 @@ function autoload($class) {
     } else {
         $file   = str_replace('_', '', $file);
     }
-
+    print $file ."<br \>";
     // create a test case file if it doesn't exist
 
     if( ! file_exists($file)) {