diff --git a/tests/Export/MysqlTestCase.php b/tests/Export/MysqlTestCase.php
index a100bbc84..b3d8aafc5 100644
--- a/tests/Export/MysqlTestCase.php
+++ b/tests/Export/MysqlTestCase.php
@@ -1,10 +1,44 @@
 <?php
-class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
-    public function __construct() {
+/*
+ *  $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_Mysql_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_Mysql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function __construct() 
+    {
         parent::__construct('mysql');
     }
 
-    public function testAlterTableThrowsExceptionWithoutValidTableName() {
+    public function testAlterTableThrowsExceptionWithoutValidTableName() 
+    {
         try {
             $this->export->alterTable(0, array(), array());
 
@@ -13,7 +47,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
             $this->pass();
         }
     }
-    public function testCreateTableExecutesSql() {
+    public function testCreateTableExecutesSql() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
@@ -23,7 +58,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsDefaultTableType() {
+    public function testCreateTableSupportsDefaultTableType() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
@@ -33,7 +69,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
         // INNODB is the default type
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = INNODB');
     }
-    public function testCreateTableSupportsMultiplePks() {
+    public function testCreateTableSupportsMultiplePks() 
+    {
         $name = 'mytable';
         $fields  = array('name' => array('type' => 'char', 'length' => 10),
                          'type' => array('type' => 'integer', 'length' => 3));
@@ -43,7 +80,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
         
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type MEDIUMINT, PRIMARY KEY(name, type)) ENGINE = INNODB');
     }
-    public function testCreateTableSupportsAutoincPks() {
+    public function testCreateTableSupportsAutoincPks() 
+    {
         $name = 'mytable';
 
         $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
@@ -53,7 +91,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE = INNODB');
     }
-    public function testCreateTableSupportsCharType() {
+    public function testCreateTableSupportsCharType() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'char', 'length' => 3));
@@ -63,7 +102,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(3)) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsCharType2() {
+    public function testCreateTableSupportsCharType2() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'char'));
@@ -73,7 +113,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(255)) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsVarcharType() {
+    public function testCreateTableSupportsVarcharType() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'varchar', 'length' => '100'));
@@ -83,7 +124,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id VARCHAR(100)) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsIntegerType() {
+    public function testCreateTableSupportsIntegerType() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'integer', 'length' => '10'));
@@ -93,7 +135,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id BIGINT) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsBlobType() {
+    public function testCreateTableSupportsBlobType() 
+    {
         $name = 'mytable';
         
         $fields  = array('content' => array('type' => 'blob'));
@@ -103,7 +146,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content LONGBLOB) ENGINE = MYISAM');
     }
-    public function testCreateTableSupportsBlobType2() {
+    public function testCreateTableSupportsBlobType2() 
+    {
         $name = 'mytable';
         
         $fields  = array('content' => array('type' => 'blob', 'length' => 2000));
@@ -114,7 +158,8 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content BLOB) ENGINE = MYISAM');
     }
 
-    public function testCreateTableSupportsBooleanType() {
+    public function testCreateTableSupportsBooleanType() 
+    {
         $name = 'mytable';
         
         $fields  = array('id' => array('type' => 'boolean'));
@@ -124,22 +169,40 @@ class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase {
 
         $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id TINYINT(1)) ENGINE = MYISAM');
     }
-    public function testCreateDatabaseExecutesSql() {
+    public function testCreateDatabaseExecutesSql() 
+    {
         $this->export->createDatabase('db');
 
         $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
     }
-    public function testDropDatabaseExecutesSql() {
+    public function testDropDatabaseExecutesSql() 
+    {
         $this->export->dropDatabase('db');
 
         $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
     }
 
-    public function testDropIndexExecutesSql() {
+    public function testDropIndexExecutesSql() 
+    {
         $this->export->dropIndex('sometable', 'relevancy');
 
         $this->assertEqual($this->adapter->pop(), 'DROP INDEX relevancy_idx ON sometable');
     }
+    public function testRecordDefinitionsSupportTableOptions() 
+    {
+        $r = new MysqlTestRecord;
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mysql_test_record (name TEXT, code BIGINT, PRIMARY KEY(name, code)) ENGINE = INNODB');
+    }
+}
+class MysqlTestRecord extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', null, 'primary');
+        $this->hasColumn('code', 'integer', null, 'primary');
 
+        $this->option('engine', 'INNODB');
+    }
 }
 ?>
diff --git a/tests/ExportTestCase.php b/tests/ExportTestCase.php
index e582a96e1..e64260748 100644
--- a/tests/ExportTestCase.php
+++ b/tests/ExportTestCase.php
@@ -1,4 +1,35 @@
 <?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_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_TestCase extends Doctrine_UnitTestCase {
     public function testCreateTableThrowsExceptionWithoutValidTableName() {
         try {
@@ -39,5 +70,8 @@ class Doctrine_Export_TestCase extends Doctrine_UnitTestCase {
         
         $this->assertEqual($this->adapter->pop(), 'DROP TABLE sometable');
     }
+    public function testRecordIsExportedProperly() {
+                                                   	
+    }
 }
 ?>
diff --git a/tests/SequenceTestCase.php b/tests/SequenceTestCase.php
index 03b3a4111..26d4af86f 100644
--- a/tests/SequenceTestCase.php
+++ b/tests/SequenceTestCase.php
@@ -62,7 +62,7 @@ class Doctrine_Sequence_TestCase extends Doctrine_UnitTestCase
 
         // transaction begin
         $this->assertEqual($this->profiler->pop()->getType(), Doctrine_Db_Event::BEGIN);
-        $this->assertEqual($this->profiler->pop()->getQuery(), 'CREATE TABLE custom_sequence_record (id INTEGER, name VARCHAR(2147483647))');
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'CREATE TABLE custom_sequence_record (id INTEGER, name VARCHAR(2147483647), PRIMARY KEY(id))');
     }
 }
 class CustomSequenceRecord extends Doctrine_Record {