diff --git a/Doctrine/Access.php b/Doctrine/Access.php
index bf59f423c..080fd0c98 100644
--- a/Doctrine/Access.php
+++ b/Doctrine/Access.php
@@ -13,11 +13,14 @@ abstract class Doctrine_Access implements ArrayAccess {
     /**
      * setArray
      * @param array $array          an array of key => value pairs
+     * @return Doctrine_Access
      */
     public function setArray(array $array) {
         foreach($array as $k=>$v):
             $this->set($k,$v);
         endforeach;
+
+        return $this;
     }
     /**
      * __set -- an alias of set()
@@ -72,11 +75,7 @@ abstract class Doctrine_Access implements ArrayAccess {
      * @param mixed $offset
      */
     public function offsetUnset($offset) {
-        if($this instanceof Doctrine_Collection) {
-            return $this->remove($offset);
-        } else {
-            $this->set($offset,null);
-        }
+        return $this->remove($offset);
     }
 }
 ?>
diff --git a/Doctrine/Cache/Sqlite.php b/Doctrine/Cache/Sqlite.php
index 2d8028dd4..44ebc26bc 100644
--- a/Doctrine/Cache/Sqlite.php
+++ b/Doctrine/Cache/Sqlite.php
@@ -21,15 +21,15 @@ class Doctrine_Cache_Sqlite {
      */
     const DELETE     = "DELETE FROM %s WHERE id %s";
     /**
-     * @var Doctrine_Table $table
+     * @var Doctrine_Table $table       the table object this cache container belongs to
      */
     private $table;
     /**
-     * @var PDO $dbh
+     * @var PDO $dbh                    database handler
      */
     private $dbh;
     /**
-     * @var array $fetched          an array of fetched primary keys
+     * @var array $fetched              an array of fetched primary keys
      */
     private $fetched = array();
 
diff --git a/Doctrine/Null.php b/Doctrine/Null.php
index 4c4012af7..f0093fbbe 100644
--- a/Doctrine/Null.php
+++ b/Doctrine/Null.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * Doctrine_Null
+ *
+ * Simple empty class representing a null value
+ * used for extra fast null value testing with isset() rather than array_key_exists()
  */
 class Doctrine_Null { }
 ?>
diff --git a/Doctrine/Record.php b/Doctrine/Record.php
index b24287637..910bfa998 100644
--- a/Doctrine/Record.php
+++ b/Doctrine/Record.php
@@ -1042,12 +1042,16 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
                                 $this->references[$name] = $table->create();
                                 $this->set($fk->getLocal(),$this->references[$name]);
                             } else {
-                                try {
-                                    $this->references[$name] = $table->find($id);
-                                } catch(Doctrine_Find_Exception $e) {
+
+                                $record = $table->find($id);
+
+                                if($record !== false) 
+                                    $this->references[$name] = $record;
+                                else
                                     $this->references[$name] = $table->create();
+                                    
                                     //$this->set($fk->getLocal(),$this->references[$name]);
-                                }
+
                             }
 
                         } elseif ($fk instanceof Doctrine_ForeignKey) {
diff --git a/Doctrine/Record/Iterator.php b/Doctrine/Record/Iterator.php
index f0ff507a7..415f40c36 100644
--- a/Doctrine/Record/Iterator.php
+++ b/Doctrine/Record/Iterator.php
@@ -33,7 +33,7 @@ class Doctrine_Record_Iterator extends ArrayIterator {
     public function current() {
         $value = parent::current();
 
-        if($value == self::$null)   
+        if($value === self::$null)   
             return null;
         else
             return $value;
diff --git a/Doctrine/Table.php b/Doctrine/Table.php
index 7ee1be612..4b9253afc 100644
--- a/Doctrine/Table.php
+++ b/Doctrine/Table.php
@@ -648,7 +648,7 @@ class Doctrine_Table extends Doctrine_Configurable {
             $this->data = $stmt->fetch(PDO::FETCH_ASSOC);
 
             if($this->data === false)
-                throw new Doctrine_Find_Exception();
+                return false;
         }
         return $this->getRecord();
     }
@@ -827,7 +827,7 @@ class Doctrine_Table extends Doctrine_Configurable {
      */
     public function getTypeOf($column) {
         if(isset($this->columns[$column]))
-            return $this->columns[$column][0];                                   	
+            return $this->columns[$column][0];
     }
     /**
      * setData
diff --git a/tests/AccessTestCase.class.php b/tests/AccessTestCase.php
similarity index 100%
rename from tests/AccessTestCase.class.php
rename to tests/AccessTestCase.php
diff --git a/tests/BatchIteratorTestCase.class.php b/tests/BatchIteratorTestCase.php
similarity index 94%
rename from tests/BatchIteratorTestCase.class.php
rename to tests/BatchIteratorTestCase.php
index ddbd93367..0cd7d734f 100644
--- a/tests/BatchIteratorTestCase.class.php
+++ b/tests/BatchIteratorTestCase.php
@@ -1,5 +1,6 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
+
 class Doctrine_BatchIteratorTestCase extends Doctrine_UnitTestCase {
     public function testIterator() {
         $graph = new Doctrine_Query($this->session);
diff --git a/tests/CacheFileTestCase.class.php b/tests/CacheFileTestCase.php
similarity index 95%
rename from tests/CacheFileTestCase.class.php
rename to tests/CacheFileTestCase.php
index 452ad6ad9..64ab875ed 100644
--- a/tests/CacheFileTestCase.class.php
+++ b/tests/CacheFileTestCase.php
@@ -1,5 +1,6 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
+
 class Doctrine_Cache_FileTestCase extends Doctrine_UnitTestCase {
     public function setUp() {
         parent::setUp();
diff --git a/tests/CacheSqliteTestCase.class.php b/tests/CacheSqliteTestCase.php
similarity index 96%
rename from tests/CacheSqliteTestCase.class.php
rename to tests/CacheSqliteTestCase.php
index df164fca7..6af739cdc 100644
--- a/tests/CacheSqliteTestCase.class.php
+++ b/tests/CacheSqliteTestCase.php
@@ -1,5 +1,6 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
+
 class Doctrine_Cache_SqliteTestCase extends Doctrine_UnitTestCase {
     public function setUp() {
         parent::setUp();
diff --git a/tests/CollectionOffsetTestCase.class.php b/tests/CollectionOffsetTestCase.php
similarity index 100%
rename from tests/CollectionOffsetTestCase.class.php
rename to tests/CollectionOffsetTestCase.php
diff --git a/tests/CollectionTestCase.class.php b/tests/CollectionTestCase.php
similarity index 100%
rename from tests/CollectionTestCase.class.php
rename to tests/CollectionTestCase.php
diff --git a/tests/CompositePrimaryKeyTestCase.class.php b/tests/CompositePrimaryKeyTestCase.php
similarity index 100%
rename from tests/CompositePrimaryKeyTestCase.class.php
rename to tests/CompositePrimaryKeyTestCase.php
diff --git a/tests/ConfigurableTestCase.class.php b/tests/ConfigurableTestCase.php
similarity index 96%
rename from tests/ConfigurableTestCase.class.php
rename to tests/ConfigurableTestCase.php
index 8c1d51934..bdc335896 100644
--- a/tests/ConfigurableTestCase.class.php
+++ b/tests/ConfigurableTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 
 class Doctrine_ConfigurableTestCase extends Doctrine_UnitTestCase {
     public function prepareTables() { }
diff --git a/tests/EventListenerTestCase.class.php b/tests/EventListenerTestCase.php
similarity index 90%
rename from tests/EventListenerTestCase.class.php
rename to tests/EventListenerTestCase.php
index 295dcc56b..d49932319 100644
--- a/tests/EventListenerTestCase.class.php
+++ b/tests/EventListenerTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 
 class Doctrine_EventListenerTestCase extends Doctrine_UnitTestCase {
     public function testEvents() {
diff --git a/tests/FormBuilderTestCase.class.php b/tests/FormBuilderTestCase.php
similarity index 100%
rename from tests/FormBuilderTestCase.class.php
rename to tests/FormBuilderTestCase.php
diff --git a/tests/IdentifierTestCase.class.php b/tests/IdentifierTestCase.php
similarity index 100%
rename from tests/IdentifierTestCase.class.php
rename to tests/IdentifierTestCase.php
diff --git a/tests/ManagerTestCase.class.php b/tests/ManagerTestCase.php
similarity index 93%
rename from tests/ManagerTestCase.class.php
rename to tests/ManagerTestCase.php
index 05b2ff9dc..02b6786e6 100644
--- a/tests/ManagerTestCase.class.php
+++ b/tests/ManagerTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 class Doctrine_ManagerTestCase extends Doctrine_UnitTestCase {
     public function testGetInstance() {
         $this->assertTrue(Doctrine_Manager::getInstance() instanceOf Doctrine_Manager);
diff --git a/tests/QueryTestCase.class.php b/tests/QueryTestCase.php
similarity index 97%
rename from tests/QueryTestCase.class.php
rename to tests/QueryTestCase.php
index 304d60c99..4ec5808cd 100644
--- a/tests/QueryTestCase.class.php
+++ b/tests/QueryTestCase.php
@@ -56,17 +56,22 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         $entries[0]->Log_Status->delete();
         $this->assertEqual($entries[0]->Log_Status, $entries[1]->Log_Status);
         $this->assertEqual($entries[0]->Log_Status->getState(), Doctrine_Record::STATE_TCLEAN);
-        
+
         // clear the identity maps
 
         $entries[0]->Log_Status->getTable()->clear();
         $entries[0]->getTable()->clear();
-        
+
         $entries = $this->session->query("FROM Log_Entry-I.Log_Status-i");
         $this->assertEqual($entries->count(), 2);
+
+        $this->assertTrue($entries[0]->Log_Status instanceof Log_Status);
+
         $this->assertEqual($entries[0]->Log_Status->name, null);
         $this->assertEqual($entries[1]->Log_Status->name, null);
+
     }
+
     public function testOneToOneRelationFetchingWithCustomTableNames() {
         $entry = new ORM_TestEntry();
         $entry->name = 'entry 1';
@@ -687,5 +692,6 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
         //$this->assertTrue(isset($values['max']));
 
     }
+
 }
 ?>
diff --git a/tests/RecordTestCase.class.php b/tests/RecordTestCase.php
similarity index 97%
rename from tests/RecordTestCase.class.php
rename to tests/RecordTestCase.php
index 588e6f9a4..43bcbc01e 100644
--- a/tests/RecordTestCase.class.php
+++ b/tests/RecordTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 
 class Doctrine_RecordTestCase extends Doctrine_UnitTestCase {
     public function testSerialize() {
diff --git a/tests/RepositoryTestCase.class.php b/tests/RepositoryTestCase.php
similarity index 100%
rename from tests/RepositoryTestCase.class.php
rename to tests/RepositoryTestCase.php
diff --git a/tests/SenseiTestCase.class.php b/tests/SenseiTestCase.php
similarity index 100%
rename from tests/SenseiTestCase.class.php
rename to tests/SenseiTestCase.php
diff --git a/tests/SessionTestCase.class.php b/tests/SessionTestCase.php
similarity index 97%
rename from tests/SessionTestCase.class.php
rename to tests/SessionTestCase.php
index 04131c84b..4f07175fe 100644
--- a/tests/SessionTestCase.class.php
+++ b/tests/SessionTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 class Doctrine_SessionTestCase extends Doctrine_UnitTestCase {
 
     public function testBuildFlushTree() {
diff --git a/tests/TableTestCase.class.php b/tests/TableTestCase.php
similarity index 96%
rename from tests/TableTestCase.class.php
rename to tests/TableTestCase.php
index 741c0a477..2d6fafc7c 100644
--- a/tests/TableTestCase.class.php
+++ b/tests/TableTestCase.php
@@ -1,5 +1,5 @@
 <?php
-require_once("UnitTestCase.class.php");
+require_once("UnitTestCase.php");
 class Doctrine_TableTestCase extends Doctrine_UnitTestCase {
     public function testBind() {
         $table = $this->session->getTable("User");
diff --git a/tests/UnitTestCase.class.php b/tests/UnitTestCase.php
similarity index 100%
rename from tests/UnitTestCase.class.php
rename to tests/UnitTestCase.php
diff --git a/tests/ValidatorTestCase.class.php b/tests/ValidatorTestCase.php
similarity index 100%
rename from tests/ValidatorTestCase.class.php
rename to tests/ValidatorTestCase.php
diff --git a/tests/run.php b/tests/run.php
index ec2611adb..91a8333cc 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -1,30 +1,27 @@
 <?php
 ob_start();
 
-require_once("ConfigurableTestCase.class.php");
-require_once("ManagerTestCase.class.php");
-require_once("SessionTestCase.class.php");
-require_once("TableTestCase.class.php");
-require_once("EventListenerTestCase.class.php");
-require_once("BatchIteratorTestCase.class.php");
-require_once("CacheFileTestCase.class.php");
-require_once("RecordTestCase.class.php");
-require_once("AccessTestCase.class.php");
-require_once("ValidatorTestCase.class.php");
-require_once("CollectionTestCase.class.php");
+require_once("ConfigurableTestCase.php");
+require_once("ManagerTestCase.php");
+require_once("SessionTestCase.php");
+require_once("TableTestCase.php");
+require_once("EventListenerTestCase.php");
+require_once("BatchIteratorTestCase.php");
+require_once("CacheFileTestCase.php");
+require_once("RecordTestCase.php");
+require_once("AccessTestCase.php");
+require_once("ValidatorTestCase.php");
+require_once("CollectionTestCase.php");
 
-require_once("CacheSqliteTestCase.class.php");
-require_once("CollectionOffsetTestCase.class.php");
-require_once("SenseiTestCase.class.php");
-require_once("QueryTestCase.class.php");
+require_once("CacheSqliteTestCase.php");
+require_once("CollectionOffsetTestCase.php");
+require_once("SenseiTestCase.php");
+require_once("QueryTestCase.php");
 
 error_reporting(E_ALL);
 
 $test = new GroupTest("Doctrine Framework Unit Tests");
 
-//$test->addTestCase(new Sensei_UnitTestCase());
-
-
 $test->addTestCase(new Doctrine_RecordTestCase());
 
 $test->addTestCase(new Doctrine_SessionTestCase());