diff --git a/tests/Collection/SnapshotTestCase.php b/tests/Collection/SnapshotTestCase.php
new file mode 100644
index 000000000..5330cc9bc
--- /dev/null
+++ b/tests/Collection/SnapshotTestCase.php
@@ -0,0 +1,102 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Collection_Snapshot_TestCase
+ *
+ * This test case is used for testing the snapshot functionality
+ * of the Doctrine_Collection
+ *
+ * Snapshots are used for counting the diff between original and changed 
+ * state of the collection.
+ *
+ * @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_Collection_Snapshot_TestCase extends Doctrine_UnitTestCase
+{
+    public function testDiffForSimpleCollection()
+    {
+        $coll = Doctrine_Query::create()->from('User u')->orderby('u.id')->execute();
+        $this->assertEqual($coll->count(), 8);
+
+        unset($coll[0]);
+        unset($coll[1]);
+
+        $coll[]->name = 'new user';
+
+        $this->assertEqual($coll->count(), 7);
+
+        $coll->save();
+
+        $this->connection->clear();
+        $coll = Doctrine_Query::create()->from('User u')->execute();
+        $this->assertEqual($coll->count(), 7);
+    }
+
+    public function testDiffForOneToManyRelatedCollection()
+    {
+        $q = Doctrine_Query::create()->from('User u LEFT JOIN u.Phonenumber p')
+                ->where('u.id = 8');
+
+        $coll = $q->execute();
+
+        $this->assertEqual($coll->count(), 1);
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 3);
+
+        unset($coll[0]->Phonenumber[0]);
+        $coll[0]->Phonenumber->remove(2);
+
+        $coll[0]->save();
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 1);
+
+        $this->connection->clear();
+
+        $q = Doctrine_Query::create()->from('User u LEFT JOIN u.Phonenumber p')->where('u.id = 8');
+
+        $coll = $q->execute();
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 1);
+    }
+    public function testDiffForManyToManyRelatedCollection()
+    {
+        $user = new User();
+        $user->name = 'zYne';
+        $user->Group[0]->name = 'PHP';
+        $user->Group[1]->name = 'Web';
+        $user->save();
+        
+        $this->connection->clear();
+
+        $users = Doctrine_Query::create()->from('User u LEFT JOIN u.Group g')
+                 ->where('u.id = ' . $user->id)->execute();
+
+        $this->assertEqual($users[0]->Group[0]->name, 'PHP');
+        $this->assertEqual($users[0]->Group[1]->name, 'Web');
+    }
+}