diff --git a/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php b/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php
index 0ad71399..09dd73bf 100644
--- a/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php
+++ b/test/Tmdb/Tests/Factory/TvEpisodeFactoryTest.php
@@ -18,9 +18,11 @@
 class TvEpisodeFactoryTest extends TestCase
 {
     /**
-     * @test
+     * @var Episode
      */
-    public function shouldConstructTvEpisode()
+    private $episode;
+
+    public function setUp()
     {
         /**
          * @var TvEpisodeFactory $factory
@@ -31,16 +33,22 @@ public function shouldConstructTvEpisode()
         /**
          * @var Episode $episode
          */
-        $episode = $factory->create($data);
+        $this->episode = $factory->create($data);
+    }
 
-        $this->assertInstanceOf('Tmdb\Model\Tv\Episode', $episode);
+    /**
+     * @test
+     */
+    public function shouldConstructTvEpisode()
+    {
+        $this->assertInstanceOf('Tmdb\Model\Tv\Episode', $this->episode);
 
-        $this->assertInstanceOf('\DateTime', $episode->getAirDate());
+        $this->assertInstanceOf('\DateTime', $this->episode->getAirDate());
 
-        $this->assertInstanceOf('Tmdb\Model\Collection\Credits', $episode->getCredits());
-        $this->assertInstanceOf('Tmdb\Model\Tv\ExternalIds', $episode->getExternalIds());
-        $this->assertInstanceOf('Tmdb\Model\Collection\Images', $episode->getImages());
-        $this->assertInstanceOf('Tmdb\Model\Image\StillImage', $episode->getStill());
+        $this->assertInstanceOf('Tmdb\Model\Collection\Credits', $this->episode->getCredits());
+        $this->assertInstanceOf('Tmdb\Model\Tv\ExternalIds', $this->episode->getExternalIds());
+        $this->assertInstanceOf('Tmdb\Model\Collection\Images', $this->episode->getImages());
+        $this->assertInstanceOf('Tmdb\Model\Image\StillImage', $this->episode->getStill());
     }
 
     /**
@@ -64,6 +72,24 @@ public function shouldBeAbleToSetFactories()
         $this->assertInstanceOf('stdClass', $factory->getImageFactory());
     }
 
+    /**
+     * @test
+     */
+    public function shouldBeFunctional()
+    {
+        $this->assertEquals(new \DateTime('2009-03-08'), $this->episode->getAirDate());
+        $this->assertEquals(1, $this->episode->getEpisodeNumber());
+        $this->assertEquals('Seven Thirty-Seven', $this->episode->getName());
+        $this->assertEquals('Walt and Jesse try to figure a way out of their partnership with Tuco. Hank tries to mend the fences between Marie and Skyler.', $this->episode->getOverview());
+        $this->assertEquals(62092, $this->episode->getId());
+        $this->assertEquals(null, $this->episode->getProductionCode());
+        $this->assertEquals(2, $this->episode->getSeasonNumber());
+        $this->assertEquals('/bwgioLAgihPCUK21rLWocDaDM3g.jpg', $this->episode->getStillPath());
+        $this->assertEquals(0, $this->episode->getVoteAverage());
+        $this->assertEquals(0, $this->episode->getVoteCount());
+
+    }
+
     protected function getFactoryClass()
     {
         return 'Tmdb\Factory\TvEpisodeFactory';
diff --git a/test/Tmdb/Tests/Model/Movie/ReleaseTest.php b/test/Tmdb/Tests/Model/Movie/ReleaseTest.php
new file mode 100644
index 00000000..8d1f20d9
--- /dev/null
+++ b/test/Tmdb/Tests/Model/Movie/ReleaseTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * This file is part of the Tmdb PHP API created by Michael Roterman.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @package Tmdb
+ * @author Michael Roterman <michael@wtfz.net>
+ * @copyright (c) 2013, Michael Roterman
+ * @version 0.0.1
+ */
+namespace Tmdb\Tests\Model\Movie;
+
+use Tmdb\Common\ObjectHydrator;
+use Tmdb\Model\Movie\Release;
+use Tmdb\Tests\Model\TestCase;
+
+class ReleaseTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function shouldBeFunctional()
+    {
+        $data = array(
+            'iso_3166_1'    => 'US',
+            'certification' => 'R',
+            'release_date'  => '1999-10-15',
+        );
+
+        $hydrator = new ObjectHydrator();
+
+        /**
+         * @var Release $object
+         */
+        $object = $hydrator->hydrate(new Release(), $data);
+
+        $this->assertEquals('US', $object->getIso31661());
+        $this->assertEquals('R', $object->getCertification());
+        $this->assertEquals(new \DateTime('1999-10-15'), $object->getReleaseDate());
+    }
+}
diff --git a/test/Tmdb/Tests/Model/MovieTest.php b/test/Tmdb/Tests/Model/MovieTest.php
index 938fa573..cf60ec2e 100644
--- a/test/Tmdb/Tests/Model/MovieTest.php
+++ b/test/Tmdb/Tests/Model/MovieTest.php
@@ -12,6 +12,8 @@
  */
 namespace Tmdb\Tests\Model;
 
+use Tmdb\Model\Collection\Credits;
+use Tmdb\Model\Collection\ResultCollection;
 use Tmdb\Model\Movie;
 
 class MovieTest extends TestCase
@@ -21,10 +23,10 @@ class MovieTest extends TestCase
      */
     public function shouldConstructMovie()
     {
-        $person = new Movie();
+        $movie = new Movie();
 
         $this->assertInstancesOf(
-            $person,
+            $movie,
             array(
                 /** Constructor */
                 'getGenres'              => 'Tmdb\Model\Collection\Genres',
@@ -44,4 +46,35 @@ public function shouldConstructMovie()
             )
         );
     }
+
+    /**
+     * @test
+     */
+    public function shouldAllowOverridingDefaultCollectionObjects()
+    {
+        $movie = new Movie();
+
+        $class     = new ResultCollection();
+        $className = get_class($class);
+
+        $movie->setChanges($class);
+        $movie->setProductionCompanies($class);
+        $movie->setProductionCountries($class);
+        $movie->setSpokenLanguages($class);
+        $movie->setCredits(new Credits());
+        $movie->setLists($class);
+
+        $this->assertInstancesOf(
+            $movie,
+            array(
+                /** Constructor */
+                'getChanges'             => $className,
+                'getProductionCompanies' => $className,
+                'getProductionCountries' => $className,
+                'getSpokenLanguages'     => $className,
+                'getCredits'             => 'Tmdb\Model\Collection\Credits',
+                'getLists'               => $className,
+            )
+        );
+    }
 }
\ No newline at end of file
diff --git a/test/Tmdb/Tests/Model/PersonTest.php b/test/Tmdb/Tests/Model/PersonTest.php
index 8f67320f..feedc3e0 100644
--- a/test/Tmdb/Tests/Model/PersonTest.php
+++ b/test/Tmdb/Tests/Model/PersonTest.php
@@ -12,6 +12,7 @@
  */
 namespace Tmdb\Tests\Model;
 
+use Tmdb\Model\Common\GenericCollection;
 use Tmdb\Model\Person;
 
 class GenreTest extends TestCase
@@ -52,4 +53,27 @@ public function shouldBeAbleToReplaceCollections()
         $this->assertInstanceOf('stdClass', $factory->getMovieCredits());
         $this->assertInstanceOf('stdClass', $factory->getTvCredits());
     }
+
+    /**
+     * @test
+     */
+    public function shouldAllowOverridingDefaultCollectionObjects()
+    {
+        $movie = new Person();
+
+        $class     = new GenericCollection();
+        $className = get_class($class);
+
+        $movie->setChanges($class);
+        $movie->setCredits($class);
+
+        $this->assertInstancesOf(
+            $movie,
+            array(
+                /** Constructor */
+                'getChanges'             => $className,
+                'getCredits'             => $className
+            )
+        );
+    }
 }
\ No newline at end of file
diff --git a/test/Tmdb/Tests/Model/Tv/TvEpisodeTest.php b/test/Tmdb/Tests/Model/Tv/EpisodeTest.php
similarity index 95%
rename from test/Tmdb/Tests/Model/Tv/TvEpisodeTest.php
rename to test/Tmdb/Tests/Model/Tv/EpisodeTest.php
index 1c5775a8..eee83fed 100644
--- a/test/Tmdb/Tests/Model/Tv/TvEpisodeTest.php
+++ b/test/Tmdb/Tests/Model/Tv/EpisodeTest.php
@@ -15,7 +15,7 @@
 use Tmdb\Tests\Model\TestCase;
 use Tmdb\Model\Tv\Episode;
 
-class TvEpisodeTest extends TestCase
+class EpisodeTest extends TestCase
 {
     /**
      * @test
diff --git a/test/Tmdb/Tests/Model/Tv/TvSeasonTest.php b/test/Tmdb/Tests/Model/Tv/SeasonTest.php
similarity index 96%
rename from test/Tmdb/Tests/Model/Tv/TvSeasonTest.php
rename to test/Tmdb/Tests/Model/Tv/SeasonTest.php
index fd88cded..6863b9d1 100644
--- a/test/Tmdb/Tests/Model/Tv/TvSeasonTest.php
+++ b/test/Tmdb/Tests/Model/Tv/SeasonTest.php
@@ -15,7 +15,7 @@
 use Tmdb\Tests\Model\TestCase;
 use Tmdb\Model\Tv\Season;
 
-class TvSeasonTest extends TestCase
+class SeasonTest extends TestCase
 {
     /**
      * @test