diff --git a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
index ad84f1078..b305d21cd 100644
--- a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.Datastore
 {
@@ -123,6 +124,25 @@ namespace NzbDrone.Core.Test.Datastore
             Db.All<JobDefinition>().Single().Name.Should().Be("B");
             Db.All<JobDefinition>().Single().Interval.Should().Be(12);
         }
+
+        [Test]
+        public void should_load_lazy_objects()
+        {
+
+            var rootFolder = Db.Insert(new RootFolders.RootFolder() { Path = "C:\test" });
+
+            var series = Builder<Series>.CreateNew()
+                .With(c=>c.RootFolderId = rootFolder.Id)
+                .BuildNew();
+
+            Db.Insert(series);
+
+
+            Db.Single<Series>().RootFolder.Should().NotBeNull();
+            Db.Single<Series>().RootFolder.Value.Should().NotBeNull();
+            Db.Single<Series>().RootFolder.Value.Path.Should().Be(rootFolder.Path);
+
+        }
     }
 
 }
diff --git a/NzbDrone.Core.Test/Framework/DbTest.cs b/NzbDrone.Core.Test/Framework/DbTest.cs
index 5186e25d1..e92011dd5 100644
--- a/NzbDrone.Core.Test/Framework/DbTest.cs
+++ b/NzbDrone.Core.Test/Framework/DbTest.cs
@@ -130,7 +130,7 @@ namespace NzbDrone.Core.Test.Framework
     public interface ITestDatabase
     {
         void InsertMany<T>(IEnumerable<T> items) where T : ModelBase, new();
-        void Insert<T>(T item) where T : ModelBase, new();
+        T Insert<T>(T item) where T : ModelBase, new();
         List<T> All<T>() where T : ModelBase, new();
         T Single<T>() where T : ModelBase, new();
         void Update<T>(T childModel) where T : ModelBase, new();
@@ -151,9 +151,9 @@ namespace NzbDrone.Core.Test.Framework
             new BasicRepository<T>(_dbConnection).InsertMany(items.ToList());
         }
 
-        public void Insert<T>(T item) where T : ModelBase, new()
+        public T Insert<T>(T item) where T : ModelBase, new()
         {
-            new BasicRepository<T>(_dbConnection).Insert(item);
+            return new BasicRepository<T>(_dbConnection).Insert(item);
         }
 
         public List<T> All<T>() where T : ModelBase, new()