diff --git a/tests/Connection/MssqlTestCase.php b/tests/Connection/MssqlTestCase.php
index c082e1655..0ac7c690e 100644
--- a/tests/Connection/MssqlTestCase.php
+++ b/tests/Connection/MssqlTestCase.php
@@ -1,61 +1,99 @@
 <?php
-class Doctrine_Connection_Mssql_TestCase extends Doctrine_Driver_UnitTestCase {
-    public function __construct() {
-        parent::__construct('sqlite');
-    }
-    public function testNoSuchTableErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'no such table: test1'));
+/*
+ *  $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_Connection_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_Connection_Mssql_TestCase extends Doctrine_UnitTestCase {
+    public function testAlreadyExistsErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 2714, '')));
         
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHTABLE);
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_ALREADY_EXISTS);
     }
-    public function testNoSuchIndexErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'no such index: test1'));
+    public function testAlreadyExistsErrorIsSupported2() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1913, '')));
         
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOT_FOUND);
-    }
-    public function testUniquePrimaryKeyErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'PRIMARY KEY must be unique'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
-    }
-    public function testIsNotUniqueErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'is not unique'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
-    }
-    public function testColumnsNotUniqueErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'columns name, id are not unique'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
-    }
-    public function testUniquenessConstraintErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'uniqueness constraint failed'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
-    }
-    public function testNotNullConstraintErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'may not be NULL'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT_NOT_NULL);
-    }
-    public function testNoSuchFieldErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, 'no such column: column1'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHFIELD);
-    }
-    public function testColumnNotPresentInTablesErrorIsSupported2() {
-        $this->exc->processErrorInfo(array(0,0, 'column not present in both tables'));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHFIELD);
-    }
-    public function testNearSyntaxErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, "near \"SELECT FROM\": syntax error"));
-        
-        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_SYNTAX);
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_ALREADY_EXISTS);
     }
     public function testValueCountOnRowErrorIsSupported() {
-        $this->exc->processErrorInfo(array(0,0, '3 values for 2 columns'));
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 110, '')));
         
         $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_VALUE_COUNT_ON_ROW);
     }
+    public function testNoSuchFieldErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 155, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHFIELD);
+    }
+    public function testNoSuchFieldErrorIsSupported2() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 207, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHFIELD);
+    }
+    public function testNoSuchTableErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 208, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHTABLE);
+    }
+    public function testNoSuchTableErrorIsSupported2() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 3701, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_NOSUCHTABLE);
+    }
+    public function testSyntaxErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 170, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_SYNTAX);
+    }
+    public function testInvalidNumberErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 245, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_INVALID_NUMBER);
+    }
+    public function testNotNullConstraintErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 515, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT_NOT_NULL);
+    }
+    public function testConstraintErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 547, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
+    }
+    public function testConstraintErrorIsSupported2() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 2627, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
+    }
+    public function testDivZeroErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 8134, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_DIVZERO);
+    }
 }
diff --git a/tests/Connection/OracleTestCase.php b/tests/Connection/OracleTestCase.php
index 60ea1b0a5..f790eb52a 100644
--- a/tests/Connection/OracleTestCase.php
+++ b/tests/Connection/OracleTestCase.php
@@ -1,8 +1,36 @@
 <?php
-class Doctrine_Connection_Oracle_TestCase extends Doctrine_Driver_UnitTestCase {
-    public function __construct() {
-        parent::__construct('oci');
-    }
+/*
+ *  $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_Connection_Oracle_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_Connection_Oracle_TestCase extends Doctrine_UnitTestCase {
     public function testNoSuchTableErrorIsSupported() {
         $this->exc->processErrorInfo(array(0, 942, ''));
         
@@ -45,7 +73,7 @@ class Doctrine_Connection_Oracle_TestCase extends Doctrine_Driver_UnitTestCase {
     }
     public function testConstraintErrorIsSupported4() {
         $this->exc->processErrorInfo(array(0, 2292, ''));
-        
+
         $this->assertEqual($this->exc->getPortableCode(), Doctrine::ERR_CONSTRAINT);
     }
     public function testNoSuchTableErrorIsSupported4() {
diff --git a/tests/Connection/PgsqlTestCase.php b/tests/Connection/PgsqlTestCase.php
index 5543afb15..2f26e9c85 100644
--- a/tests/Connection/PgsqlTestCase.php
+++ b/tests/Connection/PgsqlTestCase.php
@@ -31,9 +31,6 @@
  * @version     $Revision$
  */
 class Doctrine_Connection_Pgsql_TestCase extends Doctrine_UnitTestCase {
-    public function __construct() {
-        parent::__construct('pgsql');
-    }
     public function testNoSuchTableErrorIsSupported() {
         $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'table test does not exist')));
         
diff --git a/tests/Connection/SqliteTestCase.php b/tests/Connection/SqliteTestCase.php
index ce639a9f8..c7aacab83 100644
--- a/tests/Connection/SqliteTestCase.php
+++ b/tests/Connection/SqliteTestCase.php
@@ -1,8 +1,36 @@
 <?php
-class Doctrine_Connection_Sqlite_TestCase extends Doctrine_UnitTestCase {
-    public function __construct() {
-        parent::__construct('sqlite');
-    }
+/*
+ *  $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_Connection_Sqlite_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_Connection_Sqlite_TestCase extends Doctrine_UnitTestCase { 
     public function testNoSuchTableErrorIsSupported() {
         $this->exc->processErrorInfo(array(0,0, 'no such table: test1'));