diff --git a/test.txt b/test.txt
deleted file mode 100644
index a0b97cc4f..000000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Testing testing
diff --git a/tests/run.php b/tests/run.php
index 6ce972d60..e5b6562ce 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -227,7 +227,7 @@ $plugins->addTestCase(new Doctrine_Validator_TestCase());
 $plugins->addTestCase(new Doctrine_Validator_Future_TestCase());
 $plugins->addTestCase(new Doctrine_Validator_Past_TestCase());
 $plugins->addTestCase(new Doctrine_Hook_TestCase());
-$plugins->addTestCase(new Doctrine_I18n_TestCase());
+//$plugins->addTestCase(new Doctrine_I18n_TestCase());
 $test->addTestCase($plugins);
 
 // Db component
diff --git a/tests/schema.xml b/tests/schema.xml
index b55374623..aa8efc2d4 100755
--- a/tests/schema.xml
+++ b/tests/schema.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data><Account><tableName>account</tableName><className>Account</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id><amount><type>integer</type><length>2147483647</length><name>amount</name></amount></columns></Account><Address><tableName>address</tableName><className>Address</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><type>string</type><length>200</length><name>address</name></address></columns><relations><User><refClass>EntityAddress</refClass><local>address_id</local><foreign>user_id</foreign><type>many</type></User><EntityAddress><local>id</local><foreign>address_id</foreign><type>many</type></EntityAddress></relations></Address><Album><tableName>album</tableName><className>Album</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id><name><type>string</type><length>20</length><name>name</name></name></columns><relations><Song><local>id</local><foreign>album_id</foreign><type>many</type></Song><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Album><Assignment><tableName>assignment</tableName><className>Assignment</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><task_id><type>integer</type><length>2147483647</length><name>task_id</name></task_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><Task><local>task_id</local><foreign>id</foreign><type>one</type></Task></relations></Assignment><Description><tableName>description</tableName><className>Description</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><description><type>string</type><length>3000</length><name>description</name></description><file_md5><type>string</type><length>32</length><name>file_md5</name></file_md5></columns></Description><Element><tableName>element</tableName><className>Element</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><Child><class>Element</class><local>id</local><foreign>parent_id</foreign><type>many</type></Child><Parent><class>Element</class><local>parent_id</local><foreign>id</foreign><type>one</type></Parent></relations></Element><Email><tableName>email</tableName><className>Email</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><email>1</email><unique>1</unique><type>string</type><length>150</length><name>address</name></address></columns></Email><Entity><tableName>entity</tableName><className>Entity</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference></relations></Entity><EntityAddress><tableName>entity_address</tableName><className>EntityAddress</className><columns><user_id><primary>1</primary><type>integer</type><length>2147483647</length><name>user_id</name></user_id><address_id><primary>1</primary><type>integer</type><length>2147483647</length><name>address_id</name></address_id></columns><relations><Address><local>address_id</local><foreign>id</foreign><type>one</type></Address><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></EntityAddress><EntityReference><tableName>entity_reference</tableName><className>EntityReference</className><columns><entity1><primary>1</primary><type>integer</type><length>2147483647</length><name>entity1</name></entity1><entity2><primary>1</primary><type>integer</type><length>2147483647</length><name>entity2</name></entity2></columns><relations><Entity><local>entity1</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity1</local><foreign>id</foreign><type>one</type></Group><User><local>entity1</local><foreign>id</foreign><type>one</type></User></relations></EntityReference><Error><tableName>error</tableName><className>Error</className><columns><message><type>string</type><length>200</length><name>message</name></message><code><type>integer</type><length>11</length><name>code</name></code><file_md5><primary>1</primary><type>string</type><length>32</length><name>file_md5</name></file_md5></columns><relations><Description><local>file_md5</local><foreign>file_md5</foreign><type>one</type></Description></relations></Error><Group><tableName>entity</tableName><className>Group</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><User><refClass>Groupuser</refClass><local>group_id</local><foreign>user_id</foreign><type>many</type></User><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><Groupuser><local>id</local><foreign>group_id</foreign><type>many</type></Groupuser></relations></Group><Groupuser><tableName>groupuser</tableName><className>Groupuser</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><added><type>integer</type><length>2147483647</length><name>added</name></added><group_id><type>integer</type><length>2147483647</length><name>group_id</name></group_id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id></columns><relations><Group><local>group_id</local><foreign>id</foreign><type>one</type></Group><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Groupuser><Phonenumber><tableName>phonenumber</tableName><className>Phonenumber</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><phonenumber><type>string</type><length>20</length><name>phonenumber</name></phonenumber><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id></columns><relations><Entity><local>entity_id</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity_id</local><foreign>id</foreign><type>one</type></Group><User><local>entity_id</local><foreign>id</foreign><type>one</type></User></relations></Phonenumber><ResourceReference><tableName>resource_reference</tableName><className>ResourceReference</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type_id><type>integer</type><length>2147483647</length><name>type_id</name></type_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><ResourceType><local>resourcetype_id</local><foreign>id</foreign><type>one</type></ResourceType></relations></ResourceReference><Resource><tableName>resource</tableName><className>Resource</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name></columns><relations><TaskAlias><refClass>Assignment</refClass><class>Task</class><local>resource_id</local><foreign>task_id</foreign><type>many</type></TaskAlias><Type><refClass>ResourceReference</refClass><class>ResourceType</class><local>resource_id</local><foreign>type_id</foreign><type>many</type></Type><Assignment><local>id</local><foreign>resource_id</foreign><type>many</type></Assignment><ResourceReference><local>id</local><foreign>resource_id</foreign><type>many</type></ResourceReference></relations></Resource><ResourceType><tableName>resource_type</tableName><className>ResourceType</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type><type>string</type><length>100</length><name>type</name></type></columns><relations><ResourceAlias><refClass>ResourceReference</refClass><class>Resource</class><local>resourcetype_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><ResourceReference><local>id</local><foreign>resourcetype_id</foreign><type>many</type></ResourceReference></relations></ResourceType><Song><tableName>song</tableName><className>Song</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><album_id><type>integer</type><length>2147483647</length><name>album_id</name></album_id><genre><type>string</type><length>20</length><name>genre</name></genre><title><type>string</type><length>30</length><name>title</name></title></columns><relations><Album><local>album_id</local><foreign>id</foreign><type>one</type></Album></relations></Song><Task><tableName>task</tableName><className>Task</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><ResourceAlias><refClass>Assignment</refClass><class>Resource</class><local>task_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><Subtask><class>Task</class><local>id</local><foreign>parent_id</foreign><type>many</type></Subtask><Assignment><local>id</local><foreign>task_id</foreign><type>many</type></Assignment></relations></Task><User><tableName>entity</tableName><className>User</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><Address><refClass>EntityAddress</refClass><local>user_id</local><foreign>address_id</foreign><type>many</type></Address><Addresses><refClass>EntityAddress</refClass><class>Address</class><local>user_id</local><foreign>address_id</foreign><type>many</type></Addresses><Album><local>id</local><foreign>user_id</foreign><type>many</type></Album><Book><local>id</local><foreign>user_id</foreign><type>many</type></Book><Group><refClass>Groupuser</refClass><local>user_id</local><foreign>group_id</foreign><type>many</type></Group><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><EntityAddress><local>id</local><foreign>user_id</foreign><type>many</type></EntityAddress><Groupuser><local>id</local><foreign>user_id</foreign><type>many</type></Groupuser></relations></User></data>
+<data><Entity><tableName>entity</tableName><className>Entity</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference></relations></Entity><Address><tableName>address</tableName><className>Address</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><type>string</type><length>200</length><name>address</name></address></columns><relations><User><refClass>EntityAddress</refClass><local>address_id</local><foreign>user_id</foreign><type>many</type></User><EntityAddress><local>id</local><foreign>address_id</foreign><type>many</type></EntityAddress></relations></Address><EntityAddress><tableName>entity_address</tableName><className>EntityAddress</className><columns><user_id><primary>1</primary><type>integer</type><length>2147483647</length><name>user_id</name></user_id><address_id><primary>1</primary><type>integer</type><length>2147483647</length><name>address_id</name></address_id></columns><relations><Address><local>address_id</local><foreign>id</foreign><type>one</type></Address><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></EntityAddress><ResourceType><tableName>resource_type</tableName><className>ResourceType</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type><type>string</type><length>100</length><name>type</name></type></columns><relations><ResourceAlias><refClass>ResourceReference</refClass><class>Resource</class><local>resourcetype_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><ResourceReference><local>id</local><foreign>resourcetype_id</foreign><type>many</type></ResourceReference></relations></ResourceType><Group><tableName>entity</tableName><className>Group</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><User><refClass>Groupuser</refClass><local>group_id</local><foreign>user_id</foreign><type>many</type></User><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><Groupuser><local>id</local><foreign>group_id</foreign><type>many</type></Groupuser></relations></Group><Error><tableName>error</tableName><className>Error</className><columns><message><type>string</type><length>200</length><name>message</name></message><code><type>integer</type><length>11</length><name>code</name></code><file_md5><primary>1</primary><type>string</type><length>32</length><name>file_md5</name></file_md5></columns><relations><Description><local>file_md5</local><foreign>file_md5</foreign><type>one</type></Description></relations></Error><ResourceReference><tableName>resource_reference</tableName><className>ResourceReference</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type_id><type>integer</type><length>2147483647</length><name>type_id</name></type_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><ResourceType><local>resourcetype_id</local><foreign>id</foreign><type>one</type></ResourceType><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource></relations></ResourceReference><Song><tableName>song</tableName><className>Song</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><album_id><type>integer</type><length>2147483647</length><name>album_id</name></album_id><genre><type>string</type><length>20</length><name>genre</name></genre><title><type>string</type><length>30</length><name>title</name></title></columns><relations><Album><local>album_id</local><foreign>id</foreign><type>one</type></Album></relations></Song><Task><tableName>task</tableName><className>Task</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><ResourceAlias><refClass>Assignment</refClass><class>Resource</class><local>task_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><Subtask><class>Task</class><local>id</local><foreign>parent_id</foreign><type>many</type></Subtask><Assignment><local>id</local><foreign>task_id</foreign><type>many</type></Assignment></relations></Task><Description><tableName>description</tableName><className>Description</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><description><type>string</type><length>3000</length><name>description</name></description><file_md5><type>string</type><length>32</length><name>file_md5</name></file_md5></columns></Description><Email><tableName>email</tableName><className>Email</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><email>1</email><unique>1</unique><type>string</type><length>150</length><name>address</name></address></columns></Email><User><tableName>entity</tableName><className>User</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><Address><refClass>EntityAddress</refClass><local>user_id</local><foreign>address_id</foreign><type>many</type></Address><Addresses><refClass>EntityAddress</refClass><class>Address</class><local>user_id</local><foreign>address_id</foreign><type>many</type></Addresses><Album><local>id</local><foreign>user_id</foreign><type>many</type></Album><Book><local>id</local><foreign>user_id</foreign><type>many</type></Book><Group><refClass>Groupuser</refClass><local>user_id</local><foreign>group_id</foreign><type>many</type></Group><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><EntityAddress><local>id</local><foreign>user_id</foreign><type>many</type></EntityAddress><Groupuser><local>id</local><foreign>user_id</foreign><type>many</type></Groupuser></relations></User><Assignment><tableName>assignment</tableName><className>Assignment</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><task_id><type>integer</type><length>2147483647</length><name>task_id</name></task_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Task><local>task_id</local><foreign>id</foreign><type>one</type></Task><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource></relations></Assignment><Resource><tableName>resource</tableName><className>Resource</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name></columns><relations><TaskAlias><refClass>Assignment</refClass><class>Task</class><local>resource_id</local><foreign>task_id</foreign><type>many</type></TaskAlias><Type><refClass>ResourceReference</refClass><class>ResourceType</class><local>resource_id</local><foreign>type_id</foreign><type>many</type></Type><Assignment><local>id</local><foreign>resource_id</foreign><type>many</type></Assignment><ResourceReference><local>id</local><foreign>resource_id</foreign><type>many</type></ResourceReference></relations></Resource><EntityReference><tableName>entity_reference</tableName><className>EntityReference</className><columns><entity1><primary>1</primary><type>integer</type><length>2147483647</length><name>entity1</name></entity1><entity2><primary>1</primary><type>integer</type><length>2147483647</length><name>entity2</name></entity2></columns><relations><Entity><local>entity1</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity1</local><foreign>id</foreign><type>one</type></Group><User><local>entity1</local><foreign>id</foreign><type>one</type></User></relations></EntityReference><Element><tableName>element</tableName><className>Element</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><Child><class>Element</class><local>id</local><foreign>parent_id</foreign><type>many</type></Child><Parent><class>Element</class><local>parent_id</local><foreign>id</foreign><type>one</type></Parent></relations></Element><Phonenumber><tableName>phonenumber</tableName><className>Phonenumber</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><phonenumber><type>string</type><length>20</length><name>phonenumber</name></phonenumber><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id></columns><relations><Entity><local>entity_id</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity_id</local><foreign>id</foreign><type>one</type></Group><User><local>entity_id</local><foreign>id</foreign><type>one</type></User></relations></Phonenumber><Groupuser><tableName>groupuser</tableName><className>Groupuser</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><added><type>integer</type><length>2147483647</length><name>added</name></added><group_id><type>integer</type><length>2147483647</length><name>group_id</name></group_id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id></columns><relations><Group><local>group_id</local><foreign>id</foreign><type>one</type></Group><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Groupuser><Album><tableName>album</tableName><className>Album</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id><name><type>string</type><length>20</length><name>name</name></name></columns><relations><Song><local>id</local><foreign>album_id</foreign><type>many</type></Song><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Album><Account><tableName>account</tableName><className>Account</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id><amount><type>integer</type><length>2147483647</length><name>amount</name></amount></columns></Account></data>
diff --git a/tests/schema.yml b/tests/schema.yml
index 3bd28f62e..798496813 100644
--- a/tests/schema.yml
+++ b/tests/schema.yml
@@ -1,154 +1,4 @@
 ---
-Account: 
-  tableName: account
-  className: Account
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    entity_id: 
-      type: integer
-      length: 2147483647
-      name: entity_id
-    amount: 
-      type: integer
-      length: 2147483647
-      name: amount
-Address: 
-  tableName: address
-  className: Address
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    address: 
-      type: string
-      length: 200
-      name: address
-  relations: 
-    User: 
-      refClass: EntityAddress
-      local: address_id
-      foreign: user_id
-      type: many
-    EntityAddress: 
-      local: id
-      foreign: address_id
-      type: many
-Album: 
-  tableName: album
-  className: Album
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    user_id: 
-      type: integer
-      length: 2147483647
-      name: user_id
-    name: 
-      type: string
-      length: 20
-      name: name
-  relations: 
-    Song: 
-      local: id
-      foreign: album_id
-      type: many
-    User: 
-      local: user_id
-      foreign: id
-      type: one
-Assignment: 
-  tableName: assignment
-  className: Assignment
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    task_id: 
-      type: integer
-      length: 2147483647
-      name: task_id
-    resource_id: 
-      type: integer
-      length: 2147483647
-      name: resource_id
-Description: 
-  tableName: description
-  className: Description
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    description: 
-      type: string
-      length: 3000
-      name: description
-    file_md5: 
-      type: string
-      length: 32
-      name: file_md5
-Element: 
-  tableName: element
-  className: Element
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    name: 
-      type: string
-      length: 100
-      name: name
-    parent_id: 
-      type: integer
-      length: 2147483647
-      name: parent_id
-  relations: 
-    Child: 
-      class: Element
-      local: id
-      foreign: parent_id
-      type: many
-    Parent: 
-      class: Element
-      local: parent_id
-      foreign: id
-      type: one
-Email: 
-  tableName: email
-  className: Email
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    address: 
-      email: true
-      unique: true
-      type: string
-      length: 150
-      name: address
 Entity: 
   tableName: entity
   className: Entity
@@ -210,6 +60,30 @@ Entity:
       local: id
       foreign: entity1
       type: many
+Address: 
+  tableName: address
+  className: Address
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    address: 
+      type: string
+      length: 200
+      name: address
+  relations: 
+    User: 
+      refClass: EntityAddress
+      local: address_id
+      foreign: user_id
+      type: many
+    EntityAddress: 
+      local: id
+      foreign: address_id
+      type: many
 EntityAddress: 
   tableName: entity_address
   className: EntityAddress
@@ -229,47 +103,31 @@ EntityAddress:
       local: address_id
       foreign: id
       type: one
-EntityReference: 
-  tableName: entity_reference
-  className: EntityReference
+ResourceType: 
+  tableName: resource_type
+  className: ResourceType
   columns: 
-    entity1: 
-      primary: true
+    id: 
       type: integer
-      length: 2147483647
-      name: entity1
-    entity2: 
+      length: 20
+      autoincrement: true
       primary: true
-      type: integer
-      length: 2147483647
-      name: entity2
-  relations: 
-    Entity: 
-      local: entity1
-      foreign: id
-      type: one
-Error: 
-  tableName: error
-  className: Error
-  columns: 
-    message: 
+      name: id
+    type: 
       type: string
-      length: 200
-      name: message
-    code: 
-      type: integer
-      length: 11
-      name: code
-    file_md5: 
-      primary: true
-      type: string
-      length: 32
-      name: file_md5
+      length: 100
+      name: type
   relations: 
-    Description: 
-      local: file_md5
-      foreign: file_md5
-      type: one
+    ResourceAlias: 
+      refClass: ResourceReference
+      class: Resource
+      local: resourcetype_id
+      foreign: resource_id
+      type: many
+    ResourceReference: 
+      local: id
+      foreign: resourcetype_id
+      type: many
 Group: 
   tableName: entity
   className: Group
@@ -340,67 +198,27 @@ Group:
       local: id
       foreign: group_id
       type: many
-Groupuser: 
-  tableName: groupuser
-  className: Groupuser
+Error: 
+  tableName: error
+  className: Error
   columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    added: 
-      type: integer
-      length: 2147483647
-      name: added
-    group_id: 
-      type: integer
-      length: 2147483647
-      name: group_id
-    user_id: 
-      type: integer
-      length: 2147483647
-      name: user_id
-  relations: 
-    Group: 
-      local: group_id
-      foreign: id
-      type: one
-    User: 
-      local: user_id
-      foreign: id
-      type: one
-Phonenumber: 
-  tableName: phonenumber
-  className: Phonenumber
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    phonenumber: 
+    message: 
       type: string
-      length: 20
-      name: phonenumber
-    entity_id: 
+      length: 200
+      name: message
+    code: 
       type: integer
-      length: 2147483647
-      name: entity_id
+      length: 11
+      name: code
+    file_md5: 
+      primary: true
+      type: string
+      length: 32
+      name: file_md5
   relations: 
-    Entity: 
-      local: entity_id
-      foreign: id
-      type: one
-    Group: 
-      local: entity_id
-      foreign: id
-      type: one
-    User: 
-      local: entity_id
-      foreign: id
+    Description: 
+      local: file_md5
+      foreign: file_md5
       type: one
 ResourceReference: 
   tableName: resource_reference
@@ -420,66 +238,11 @@ ResourceReference:
       type: integer
       length: 2147483647
       name: resource_id
-Resource: 
-  tableName: resource
-  className: Resource
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    name: 
-      type: string
-      length: 100
-      name: name
   relations: 
-    TaskAlias: 
-      refClass: Assignment
-      class: Task
-      local: resource_id
-      foreign: task_id
-      type: many
-    Type: 
-      refClass: ResourceReference
-      class: ResourceType
-      local: resource_id
-      foreign: type_id
-      type: many
-    Assignment: 
-      local: id
-      foreign: resource_id
-      type: many
-    ResourceReference: 
-      local: id
-      foreign: resource_id
-      type: many
-ResourceType: 
-  tableName: resource_type
-  className: ResourceType
-  columns: 
-    id: 
-      type: integer
-      length: 20
-      autoincrement: true
-      primary: true
-      name: id
-    type: 
-      type: string
-      length: 100
-      name: type
-  relations: 
-    ResourceAlias: 
-      refClass: ResourceReference
-      class: Resource
+    ResourceType: 
       local: resourcetype_id
-      foreign: resource_id
-      type: many
-    ResourceReference: 
-      local: id
-      foreign: resourcetype_id
-      type: many
+      foreign: id
+      type: one
 Song: 
   tableName: song
   className: Song
@@ -541,6 +304,40 @@ Task:
       local: id
       foreign: task_id
       type: many
+Description: 
+  tableName: description
+  className: Description
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    description: 
+      type: string
+      length: 3000
+      name: description
+    file_md5: 
+      type: string
+      length: 32
+      name: file_md5
+Email: 
+  tableName: email
+  className: Email
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    address: 
+      email: true
+      unique: true
+      type: string
+      length: 150
+      name: address
 User: 
   tableName: entity
   className: User
@@ -634,3 +431,224 @@ User:
       local: id
       foreign: user_id
       type: many
+Assignment: 
+  tableName: assignment
+  className: Assignment
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    task_id: 
+      type: integer
+      length: 2147483647
+      name: task_id
+    resource_id: 
+      type: integer
+      length: 2147483647
+      name: resource_id
+  relations: 
+    Task: 
+      local: task_id
+      foreign: id
+      type: one
+Resource: 
+  tableName: resource
+  className: Resource
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    name: 
+      type: string
+      length: 100
+      name: name
+  relations: 
+    TaskAlias: 
+      refClass: Assignment
+      class: Task
+      local: resource_id
+      foreign: task_id
+      type: many
+    Type: 
+      refClass: ResourceReference
+      class: ResourceType
+      local: resource_id
+      foreign: type_id
+      type: many
+    Assignment: 
+      local: id
+      foreign: resource_id
+      type: many
+    ResourceReference: 
+      local: id
+      foreign: resource_id
+      type: many
+EntityReference: 
+  tableName: entity_reference
+  className: EntityReference
+  columns: 
+    entity1: 
+      primary: true
+      type: integer
+      length: 2147483647
+      name: entity1
+    entity2: 
+      primary: true
+      type: integer
+      length: 2147483647
+      name: entity2
+  relations: 
+    Entity: 
+      local: entity1
+      foreign: id
+      type: one
+    Group: 
+      local: entity1
+      foreign: id
+      type: one
+    User: 
+      local: entity1
+      foreign: id
+      type: one
+Element: 
+  tableName: element
+  className: Element
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    name: 
+      type: string
+      length: 100
+      name: name
+    parent_id: 
+      type: integer
+      length: 2147483647
+      name: parent_id
+  relations: 
+    Child: 
+      class: Element
+      local: id
+      foreign: parent_id
+      type: many
+    Parent: 
+      class: Element
+      local: parent_id
+      foreign: id
+      type: one
+Phonenumber: 
+  tableName: phonenumber
+  className: Phonenumber
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    phonenumber: 
+      type: string
+      length: 20
+      name: phonenumber
+    entity_id: 
+      type: integer
+      length: 2147483647
+      name: entity_id
+  relations: 
+    Entity: 
+      local: entity_id
+      foreign: id
+      type: one
+    Group: 
+      local: entity_id
+      foreign: id
+      type: one
+    User: 
+      local: entity_id
+      foreign: id
+      type: one
+Groupuser: 
+  tableName: groupuser
+  className: Groupuser
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    added: 
+      type: integer
+      length: 2147483647
+      name: added
+    group_id: 
+      type: integer
+      length: 2147483647
+      name: group_id
+    user_id: 
+      type: integer
+      length: 2147483647
+      name: user_id
+  relations: 
+    Group: 
+      local: group_id
+      foreign: id
+      type: one
+    User: 
+      local: user_id
+      foreign: id
+      type: one
+Album: 
+  tableName: album
+  className: Album
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    user_id: 
+      type: integer
+      length: 2147483647
+      name: user_id
+    name: 
+      type: string
+      length: 20
+      name: name
+  relations: 
+    Song: 
+      local: id
+      foreign: album_id
+      type: many
+    User: 
+      local: user_id
+      foreign: id
+      type: one
+Account: 
+  tableName: account
+  className: Account
+  columns: 
+    id: 
+      type: integer
+      length: 20
+      autoincrement: true
+      primary: true
+      name: id
+    entity_id: 
+      type: integer
+      length: 2147483647
+      name: entity_id
+    amount: 
+      type: integer
+      length: 2147483647
+      name: amount