diff --git a/Doctrine/Collection.php b/Doctrine/Collection.php
index 3f8cafb9b..527a82319 100644
--- a/Doctrine/Collection.php
+++ b/Doctrine/Collection.php
@@ -511,7 +511,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
         if(isset($this->keyColumn)) {
             $value = $record->get($this->keyColumn);
             if($value === null)
-                throw new Doctrine_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
+                throw new Doctrine_Collection_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
 
             $this->data[$value] = $record;
         } else
@@ -544,7 +544,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
         if(isset($this->keyColumn)) {
             $value = $record->get($this->keyColumn);
             if($value === null)
-                throw new Doctrine_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
+                throw new Doctrine_Collection_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
 
             $this->data[$value] = $record;
         } else
@@ -579,7 +579,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
 
                     $value = $record->get($this->keyColumn);
                     if($value === null)
-                        throw new Doctrine_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
+                        throw new Doctrine_Collection_Exception("Couldn't create collection index. Record field '".$this->keyColumn."' was null.");
 
                     $this->data[$value] = $record;
                     unset($this->data[$k]);
@@ -591,6 +591,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
      * loadRelated
      *
      * @param mixed $name
+     * @return boolean
      */
     public function loadRelated($name = null) {
         $query   = new Doctrine_Query($this->table->getConnection());
diff --git a/Doctrine/Configurable.php b/Doctrine/Configurable.php
index 313f6a126..2388faa1d 100644
--- a/Doctrine/Configurable.php
+++ b/Doctrine/Configurable.php
@@ -87,12 +87,12 @@ abstract class Doctrine_Configurable {
             break;
             case Doctrine::ATTR_LOCKMODE:
                 if($this instanceof Doctrine_Connection) {
-                    if($this->getState() != Doctrine_Connection::STATE_OPEN)
+                    if($this->getTransaction()->getState() != Doctrine_Transaction::STATE_OPEN)
                         throw new Doctrine_Exception("Couldn't set lockmode. There are transactions open.");
 
                 } elseif($this instanceof Doctrine_Manager) {
                     foreach($this as $connection) {
-                        if($connection->getState() != Doctrine_Connection::STATE_OPEN)
+                        if($connection->getTransaction()->getState() != Doctrine_Transaction::STATE_OPEN)
                             throw new Doctrine_Exception("Couldn't set lockmode. There are transactions open.");
                     }
                 } else {
diff --git a/Doctrine/Connection.php b/Doctrine/Connection.php
index b623a6e85..c89d4ba79 100644
--- a/Doctrine/Connection.php
+++ b/Doctrine/Connection.php
@@ -28,62 +28,18 @@
  */
 abstract class Doctrine_Connection extends Doctrine_Configurable implements Countable, IteratorAggregate {
     /**
-     * Doctrine_Connection is in open state when it is opened and there are no active transactions
-     */
-    const STATE_OPEN        = 0;
-    /**
-     * Doctrine_Connection is in closed state when it is closed
-     */
-    const STATE_CLOSED      = 1;
-    /**
-     * Doctrine_Connection is in active state when it has one active transaction
-     */
-    const STATE_ACTIVE      = 2;
-    /**
-     * Doctrine_Connection is in busy state when it has multiple active transactions
-     */
-    const STATE_BUSY        = 3;
-    /**
-     * @var $dbh                            the database handle
+     * @var $dbh                            the database handler
      */
     private $dbh;
     /**
-     * @see Doctrine_Connection::STATE_* constants
-     * @var boolean $state                  the current state of the connection
+     * @var Doctrine_Transaction $tx        the transaction object
      */
-    private $state              = 0;
-    /**
-     * @var integer $transaction_level      the nesting level of transactions, used by transaction methods
-     */
-    private $transaction_level  = 0;
+    private $tx;
     /**
      * @var array $tables                   an array containing all the initialized Doctrine_Table objects
      *                                      keys representing Doctrine_Table component names and values as Doctrine_Table objects
      */
     protected $tables           = array();
-    /**
-     * @var Doctrine_Validator $validator   transaction validator
-     */
-    protected $validator;
-    /**
-     * @var array $update                   two dimensional pending update list, the records in
-     *                                      this list will be updated when transaction is committed
-     */
-    protected $update           = array();
-    /**
-     * @var array $insert                   two dimensional pending insert list, the records in
-     *                                      this list will be inserted when transaction is committed
-     */
-    protected $insert           = array();
-    /**
-     * @var array $delete                   two dimensional pending delete list, the records in
-     *                                      this list will be deleted when transaction is committed
-     */
-    protected $delete           = array();
-
-
-
-
     /**
      * the constructor
      *
@@ -92,7 +48,8 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      */
     public function __construct(Doctrine_Manager $manager,PDO $pdo) {
         $this->dbh   = $pdo;
-        $this->state = Doctrine_Connection::STATE_OPEN;
+
+        $this->tx    = new Doctrine_Transaction($this);
 
         $this->setParent($manager);
 
@@ -102,13 +59,14 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         $this->getAttribute(Doctrine::ATTR_LISTENER)->onOpen($this);
     }
     /**
-     * returns the state of this connection
+     * getTransaction
      *
-     * @see Doctrine_Connection::STATE_* constants
-     * @return integer          the connection state
+     * returns the current transaction object
+     *
+     * @return Doctrine_Transaction
      */
-    public function getState() {
-        return $this->state;
+    public function getTransaction() {
+        return $this->tx;
     }
     /**
      * returns the manager that created this connection
@@ -439,7 +397,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      * @return integer
      */
     public function getTransactionLevel() {
-        return $this->transaction_level;
+        return $this->tx->getTransactionLevel();
     }
     /**
      * beginTransaction
@@ -447,18 +405,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      * @return void
      */
     public function beginTransaction() {
-        if($this->transaction_level == 0) {
-
-            if($this->getAttribute(Doctrine::ATTR_LOCKMODE) == Doctrine::LOCK_PESSIMISTIC) {
-                $this->getAttribute(Doctrine::ATTR_LISTENER)->onPreTransactionBegin($this);
-                $this->dbh->beginTransaction();
-                $this->getAttribute(Doctrine::ATTR_LISTENER)->onTransactionBegin($this);
-            }
-            $this->state  = Doctrine_Connection::STATE_ACTIVE;
-        } else {
-            $this->state = Doctrine_Connection::STATE_BUSY;
-        }
-        $this->transaction_level++;
+        $this->tx->beginTransaction();
     }
     /**
      * commits the current transaction
@@ -468,53 +415,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      * @return void
      */
     public function commit() {
-
-        $this->transaction_level--;
-    
-        if($this->transaction_level == 0) {
-
-    
-            if($this->getAttribute(Doctrine::ATTR_LOCKMODE) == Doctrine::LOCK_OPTIMISTIC) {
-                $this->getAttribute(Doctrine::ATTR_LISTENER)->onPreTransactionBegin($this);
-    
-                $this->dbh->beginTransaction();
-    
-                $this->getAttribute(Doctrine::ATTR_LISTENER)->onTransactionBegin($this);
-            }
-    
-            if($this->getAttribute(Doctrine::ATTR_VLD))
-                $this->validator = new Doctrine_Validator();
-
-            try {
-                
-                $this->bulkInsert();
-                $this->bulkUpdate();
-                $this->bulkDelete();
-
-                if($this->getAttribute(Doctrine::ATTR_VLD)) {
-                    if($this->validator->hasErrors()) {
-                        $this->rollback();
-                        throw new Doctrine_Validator_Exception($this->validator);
-                    }
-                }
-
-                $this->dbh->commit();
-
-            } catch(PDOException $e) {
-                $this->rollback();
-
-                throw new Doctrine_Exception($e->__toString());
-            }
-
-            $this->getAttribute(Doctrine::ATTR_LISTENER)->onTransactionCommit($this);
-
-            $this->delete = array();
-            $this->state  = Doctrine_Connection::STATE_OPEN;
-    
-            $this->validator = null;
-    
-        } elseif($this->transaction_level == 1)
-            $this->state = Doctrine_Connection::STATE_ACTIVE;
+        $this->tx->commit();
     }
     /**
      * rollback
@@ -526,69 +427,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      * @return void
      */
     public function rollback() {
-        $this->getAttribute(Doctrine::ATTR_LISTENER)->onPreTransactionRollback($this);
-
-        $this->transaction_level = 0;
-        $this->dbh->rollback();
-        $this->state = Doctrine_Connection::STATE_OPEN;
-
-        $this->getAttribute(Doctrine::ATTR_LISTENER)->onTransactionRollback($this);
-    }
-    /**
-     * bulkInsert
-     * inserts all the objects in the pending insert list into database
-     * @return void
-     */
-    public function bulkInsert() {
-        if(empty($this->insert))
-            return false;
-
-        foreach($this->insert as $name => $inserts) {
-            if( ! isset($inserts[0]))
-                continue;
-
-            $record    = $inserts[0];
-            $table     = $record->getTable();
-            $seq       = $table->getSequenceName();
-
-            $increment = false;
-            $keys      = $table->getPrimaryKeys();
-            $id        = null;
-
-            if(count($keys) == 1 && $keys[0] == $table->getIdentifier()) {
-                $increment = true;
-            }
-
-            foreach($inserts as $k => $record) {
-                $table->getAttribute(Doctrine::ATTR_LISTENER)->onPreSave($record);
-                // listen the onPreInsert event
-                $table->getAttribute(Doctrine::ATTR_LISTENER)->onPreInsert($record);
-
-
-                $this->insert($record);
-                if($increment) {
-                    if($k == 0) {
-                        // record uses auto_increment column
-
-                        $id = $this->dbh->lastInsertID();
-
-                        if( ! $id)
-                            $id = $table->getMaxIdentifier();
-                    }
-    
-                    $record->assignIdentifier($id);
-                    $id++;
-                } else
-                    $record->assignIdentifier(true);
-
-                // listen the onInsert event
-                $table->getAttribute(Doctrine::ATTR_LISTENER)->onInsert($record);
-
-                $table->getAttribute(Doctrine::ATTR_LISTENER)->onSave($record);
-            }
-        }
-        $this->insert = array();
-        return true;
+        $this->tx->rollback();
     }
     /**
      * returns maximum identifier values
@@ -616,56 +455,6 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         }
         return $values;
     }
-    /**
-     * bulkUpdate
-     * updates all objects in the pending update list
-     *
-     * @return void
-     */
-    public function bulkUpdate() {
-        foreach($this->update as $name => $updates) {
-            $ids = array();
-
-            foreach($updates as $k => $record) {
-                $record->getTable()->getAttribute(Doctrine::ATTR_LISTENER)->onPreSave($record);
-                // listen the onPreUpdate event
-                $record->getTable()->getAttribute(Doctrine::ATTR_LISTENER)->onPreUpdate($record);
-
-                $this->update($record);
-                // listen the onUpdate event
-                $record->getTable()->getAttribute(Doctrine::ATTR_LISTENER)->onUpdate($record);
-
-                $record->getTable()->getAttribute(Doctrine::ATTR_LISTENER)->onSave($record);
-            }
-        }
-        $this->update = array();
-    }
-    /**
-     * bulkDelete
-     * deletes all records from the pending delete list
-     *
-     * @return void
-     */
-    public function bulkDelete() {
-        foreach($this->delete as $name => $deletes) {
-            $record = false;
-            $ids    = array();
-            foreach($deletes as $k => $record) {
-                $ids[] = $record->getIncremented();
-                $record->assignIdentifier(false);
-            }
-            if($record instanceof Doctrine_Record) {
-                $table  = $record->getTable();
-
-                $params  = substr(str_repeat("?, ",count($ids)),0,-2);
-                $query   = "DELETE FROM ".$record->getTable()->getTableName()." WHERE ".$table->getIdentifier()." IN(".$params.")";
-                $this->execute($query,$ids);
-
-                $record->getTable()->getCache()->deleteMultiple($ids);
-            }
-        }
-        $this->delete = array();
-    }
     /**
      * saves a collection
      *
@@ -703,11 +492,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
     public function save(Doctrine_Record $record) {
         switch($record->getState()):
             case Doctrine_Record::STATE_TDIRTY:
-                $this->addInsert($record);
+                $this->tx->addInsert($record);
             break;
             case Doctrine_Record::STATE_DIRTY:
             case Doctrine_Record::STATE_PROXY:
-                $this->addUpdate($record);
+                $this->tx->addUpdate($record);
             break;
             case Doctrine_Record::STATE_CLEAN:
             case Doctrine_Record::STATE_TCLEAN:
@@ -759,96 +548,6 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         }
         return $saveLater;
     }
-    /**
-     * updates the given record
-     *
-     * @param Doctrine_Record $record
-     * @return boolean
-     */
-    private function update(Doctrine_Record $record) {
-        $array = $record->getPrepared();
-
-        if(empty($array))
-            return false;
-
-        $set   = array();
-        foreach($array as $name => $value):
-                $set[] = $name." = ?";
-
-                if($value instanceof Doctrine_Record) {
-                    switch($value->getState()):
-                        case Doctrine_Record::STATE_TCLEAN:
-                        case Doctrine_Record::STATE_TDIRTY:
-                            $record->save();
-                        default:
-                            $array[$name] = $value->getIncremented();
-                            $record->set($name, $value->getIncremented());
-                    endswitch;
-                }
-        endforeach;
-
-        if(isset($this->validator)) {
-            if( ! $this->validator->validateRecord($record)) {
-                return false;
-            }
-        }
-
-        $params   = array_values($array);
-        $id       = $record->obtainIdentifier();
-
-
-        if( ! is_array($id))
-            $id = array($id);
-
-        $id     = array_values($id);
-        $params = array_merge($params, $id);
-
-
-        $sql  = "UPDATE ".$record->getTable()->getTableName()." SET ".implode(", ",$set)." WHERE ".implode(" = ? AND ",$record->getTable()->getPrimaryKeys())." = ?";
-
-        $stmt = $this->dbh->prepare($sql);
-        $stmt->execute($params);
-
-        $record->assignIdentifier(true);
-
-        return true;
-    }
-    /**
-     * inserts a record into database
-     *
-     * @param Doctrine_Record $record
-     * @return boolean
-     */
-    private function insert(Doctrine_Record $record) {
-        $array = $record->getPrepared();
-
-        if(empty($array))
-            return false;
-
-        $seq = $record->getTable()->getSequenceName();
-
-        if( ! empty($seq)) {
-            $id             = $this->getNextID($seq);
-            $name           = $record->getTable()->getIdentifier();
-            $array[$name]   = $id;
-        }
-
-        if(isset($this->validator)) {
-            if( ! $this->validator->validateRecord($record)) {
-                return false;
-            }
-        }
-
-        $strfields = join(", ", array_keys($array));
-        $strvalues = substr(str_repeat("?, ",count($array)),0,-2); 
-        $sql  = "INSERT INTO ".$record->getTable()->getTableName()." (".$strfields.") VALUES (".$strvalues.")";
-
-        $stmt = $this->dbh->prepare($sql);
-
-        $stmt->execute(array_values($array));
-
-        return true;
-    }
     /**
      * deletes all related composites
      * this method is always called internally when a record is deleted
@@ -866,6 +565,82 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
             endswitch;
         }
     }
+    /**
+     * saveAssociations
+     * save the associations of many-to-many relations
+     * this method also deletes associations that do not exist anymore
+     * @return void
+     */
+    final public function saveAssociations(Doctrine_Record $record) {
+        foreach($record->getTable()->table->getRelations() as $rel):
+            $table   = $rel->getTable();
+            $name    = $table->getComponentName();
+            $alias   = $this->table->getAlias($name);
+
+            if($rel instanceof Doctrine_Association) {
+                switch($rel->getType()):
+                    case Doctrine_Relation::MANY_COMPOSITE:
+                    break;
+                    case Doctrine_Relation::MANY_AGGREGATE:
+                        $asf     = $rel->getAssociationFactory();
+
+                        if($record->hasReference($alias)) {
+
+                            $new = $record->getReference($alias);
+
+                            if( ! $this->hasOriginalsFor($alias)) {
+                                $record->loadReference($alias);
+                            }
+
+                            $r = Doctrine_Relation::getDeleteOperations($this->originals[$alias],$new);
+
+                            foreach($r as $record) {
+                                $query = "DELETE FROM ".$asf->getTableName()." WHERE ".$fk->getForeign()." = ?"
+                                                                            ." AND ".$fk->getLocal()." = ?";
+                                $this->table->getConnection()->execute($query, array($record->getIncremented(),$this->getIncremented()));
+                            }
+
+                            $r = Doctrine_Relation::getInsertOperations($this->originals[$alias],$new);
+                            foreach($r as $record) {
+                                $reldao = $asf->create();
+                                $reldao->set($fk->getForeign(),$record);
+                                $reldao->set($fk->getLocal(),$this);
+                                $reldao->save();
+
+                            }
+                            $this->originals[$alias] = clone $this->references[$alias];
+                        }
+                    break;
+                endswitch;
+            } elseif($fk instanceof Doctrine_ForeignKey ||
+                     $fk instanceof Doctrine_LocalKey) {
+
+                switch($fk->getType()):
+                    case Doctrine_Relation::ONE_COMPOSITE:
+                        if(isset($this->originals[$alias]) && $this->originals[$alias]->obtainIdentifier() != $this->references[$alias]->obtainIdentifier())
+                            $this->originals[$alias]->delete();
+
+                    break;
+                    case Doctrine_Relation::MANY_COMPOSITE:
+                        if(isset($this->references[$alias])) {
+                            $new = $this->references[$alias];
+
+                            if( ! isset($this->originals[$alias]))
+                                $this->loadReference($alias);
+
+                            $r = Doctrine_Relation::getDeleteOperations($this->originals[$alias], $new);
+
+                            foreach($r as $record) {
+                                $record->delete();
+                            }
+
+                            $this->originals[$alias] = clone $this->references[$alias];
+                        }
+                    break;
+                endswitch;
+            }
+        endforeach;
+    }
     /**
      * deletes this data access object and all the related composites
      * this operation is isolated by a transaction
@@ -882,7 +657,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
                 $this->beginTransaction();
 
                 $this->deleteComposites($record);
-                $this->addDelete($record);
+                $this->tx->addDelete($record);
 
                 $this->commit();
                 return true;
@@ -891,55 +666,6 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
                 return false;
         endswitch;    
     }
-    /**
-     * adds record into pending insert list
-     * @param Doctrine_Record $record
-     */
-    public function addInsert(Doctrine_Record $record) {
-        $name = $record->getTable()->getComponentName();
-        $this->insert[$name][] = $record;
-    }
-    /**
-     * adds record into penging update list
-     * @param Doctrine_Record $record
-     */
-    public function addUpdate(Doctrine_Record $record) {
-        $name = $record->getTable()->getComponentName();
-        $this->update[$name][] = $record;
-    }
-    /**
-     * adds record into pending delete list
-     * @param Doctrine_Record $record
-     */
-    public function addDelete(Doctrine_Record $record) {
-        $name = $record->getTable()->getComponentName();
-        $this->delete[$name][] = $record;
-    }
-    /**
-     * returns the pending insert list
-     *
-     * @return array
-     */
-    public function getInserts() {
-        return $this->insert;
-    }
-    /**
-     * returns the pending update list
-     *
-     * @return array
-     */
-    public function getUpdates() {
-        return $this->update;
-    }
-    /**
-     * returns the pending delete list
-     *
-     * @return array
-     */
-    public function getDeletes() {
-        return $this->delete;
-    }
-
     /**
      * returns a string representation of this object
      * @return string
diff --git a/Doctrine/Lib.php b/Doctrine/Lib.php
index fd551d7aa..374d15146 100644
--- a/Doctrine/Lib.php
+++ b/Doctrine/Lib.php
@@ -73,16 +73,16 @@ class Doctrine_Lib {
      */
     public static function getConnectionStateAsString($state) {
         switch($state):
-            case Doctrine_Connection::STATE_OPEN:
+            case Doctrine_Transaction::STATE_OPEN:
                 return "open";
             break;
-            case Doctrine_Connection::STATE_CLOSED:
+            case Doctrine_Transaction::STATE_CLOSED:
                 return "closed";
             break;
-            case Doctrine_Connection::STATE_BUSY:
+            case Doctrine_Transaction::STATE_BUSY:
                 return "busy";
             break;
-            case Doctrine_Connection::STATE_ACTIVE:
+            case Doctrine_Transaction::STATE_ACTIVE:
                 return "active";
             break;
         endswitch;
diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index 3382808cc..d190e7d08 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -1112,6 +1112,17 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
     public function hasReference($name) {
         return isset($this->references[$name]);
     }
+    /**
+     * obtainReference
+     * 
+     * @param string $name
+     */
+    public function obtainReference($name) {
+        if(isset($this->references[$name]))
+            return $this->references[$name];
+    
+        throw new Doctrine_Record_Exception("Unknown reference $name");
+    }
     /**
      * initalizes a one-to-one relation
      *
diff --git a/tests/ConnectionTestCase.php b/tests/ConnectionTestCase.php
index 88153657b..0d89742a8 100644
--- a/tests/ConnectionTestCase.php
+++ b/tests/ConnectionTestCase.php
@@ -313,8 +313,8 @@ class Doctrine_ConnectionTestCase extends Doctrine_UnitTestCase {
         $this->assertTrue($this->connection->getIterator() instanceof ArrayIterator);
     }
     public function testGetState() {
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_OPEN);
-        $this->assertEqual(Doctrine_Lib::getConnectionStateAsString($this->connection->getState()), "open");
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_OPEN);
+        $this->assertEqual(Doctrine_Lib::getConnectionStateAsString($this->connection->getTransaction()->getState()), "open");
     }
     public function testGetTables() {
         $this->assertTrue(is_array($this->connection->getTables()));
@@ -323,9 +323,9 @@ class Doctrine_ConnectionTestCase extends Doctrine_UnitTestCase {
     public function testTransactions() {
 
         $this->connection->beginTransaction();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_ACTIVE);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_ACTIVE);
         $this->connection->commit();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_OPEN);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_OPEN);
 
         $this->connection->beginTransaction();
         
@@ -343,24 +343,24 @@ class Doctrine_ConnectionTestCase extends Doctrine_UnitTestCase {
     public function testRollback() {
         $this->connection->beginTransaction();
         $this->assertEqual($this->connection->getTransactionLevel(),1);
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_ACTIVE);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_ACTIVE);
         $this->connection->rollback();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_OPEN);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_OPEN);
         $this->assertEqual($this->connection->getTransactionLevel(),0);
     }
     public function testNestedTransactions() {
         $this->assertEqual($this->connection->getTransactionLevel(),0);
         $this->connection->beginTransaction();
         $this->assertEqual($this->connection->getTransactionLevel(),1);
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_ACTIVE);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_ACTIVE);
         $this->connection->beginTransaction();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_BUSY);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_BUSY);
         $this->assertEqual($this->connection->getTransactionLevel(),2);
         $this->connection->commit();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_ACTIVE);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_ACTIVE);
         $this->assertEqual($this->connection->getTransactionLevel(),1);
         $this->connection->commit();
-        $this->assertEqual($this->connection->getState(),Doctrine_Connection::STATE_OPEN);
+        $this->assertEqual($this->connection->getTransaction()->getState(),Doctrine_Transaction::STATE_OPEN);
         $this->assertEqual($this->connection->getTransactionLevel(),0);
     }
 }
diff --git a/tests/QueryTestCase.php b/tests/QueryTestCase.php
index 8a752c1d8..79b9e23ef 100644
--- a/tests/QueryTestCase.php
+++ b/tests/QueryTestCase.php
@@ -30,7 +30,7 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         $this->connection->clear();
     }
 
-    /**
+
     public function testBracktExplode() {
         $str   = "item OR item || item";
         $parts = Doctrine_Query::bracketExplode($str, array(' \|\| ', ' OR '), "(", ")");
@@ -1274,6 +1274,6 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         //$this->assertTrue(isset($values['max']));
 
     }
-    */
+
 }
 ?>
diff --git a/tests/ValidatorTestCase.php b/tests/ValidatorTestCase.php
index f930772fd..c1aea018e 100644
--- a/tests/ValidatorTestCase.php
+++ b/tests/ValidatorTestCase.php
@@ -4,6 +4,7 @@ class Doctrine_ValidatorTestCase extends Doctrine_UnitTestCase {
         $this->tables[] = "ValidatorTest";
         parent::prepareTables();
     }
+
     public function testIsValidType() {
         $var = "123";
         $this->assertTrue(Doctrine_Validator::isValidType($var,"string"));
@@ -144,6 +145,7 @@ class Doctrine_ValidatorTestCase extends Doctrine_UnitTestCase {
 
 
     }
+
     public function testSave() {
         $this->manager->setAttribute(Doctrine::ATTR_VLD, true);
         $user = $this->connection->getTable("User")->find(4);
diff --git a/tests/run.php b/tests/run.php
index 9d855b84c..18d726c7b 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -32,7 +32,12 @@ require_once("ImportTestCase.php");
 error_reporting(E_ALL);
 
 $test = new GroupTest("Doctrine Framework Unit Tests");
-/**
+
+
+
+
+$test->addTestCase(new Doctrine_ConnectionTestCase());
+
 $test->addTestCase(new Doctrine_RecordTestCase());
 
 $test->addTestCase(new Doctrine_AccessTestCase());
@@ -41,14 +46,14 @@ $test->addTestCase(new Doctrine_EventListenerTestCase());
 
 $test->addTestCase(new Doctrine_TableTestCase());
 
-$test->addTestCase(new Doctrine_ConnectionTestCase());
-
 $test->addTestCase(new Doctrine_ManagerTestCase());
 
 $test->addTestCase(new Doctrine_BatchIteratorTestCase());
 
 $test->addTestCase(new Doctrine_ConfigurableTestCase());
 
+$test->addTestCase(new Doctrine_ValidatorTestCase());
+
 $test->addTestCase(new Doctrine_Collection_OffsetTestCase());
 
 $test->addTestCase(new Doctrine_PessimisticLockingTestCase());
@@ -71,12 +76,10 @@ $test->addTestCase(new Doctrine_SchemaTestCase());
 
 $test->addTestCase(new Doctrine_ImportTestCase());
 
-$test->addTestCase(new Doctrine_ValidatorTestCase());
-
 $test->addTestCase(new Doctrine_CollectionTestCase());
 
 $test->addTestCase(new Doctrine_QueryTestCase());
-  */
+
 $test->addTestCase(new Doctrine_Query_ReferenceModel_TestCase());