diff --git a/NzbDrone.Core.Test/Framework/TestDbHelper.cs b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
index bed08ad32..c54f91954 100644
--- a/NzbDrone.Core.Test/Framework/TestDbHelper.cs
+++ b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
@@ -16,9 +16,9 @@ namespace NzbDrone.Core.Test.Framework
     {
         private const string DB_TEMPLATE_NAME = "_dbtemplate.sdf";
 
-        public static string ConnectionString { get; private set; }
+        internal static string ConnectionString { get; private set; }
 
-        public static IDatabase GetEmptyDatabase(bool enableLogging = false, string fileName = "")
+        internal static IDatabase GetEmptyDatabase(bool enableLogging = false, string fileName = "")
         {
             Console.WriteLine("====================DataBase====================");
             Console.WriteLine("Cloning database from template.");
@@ -41,21 +41,12 @@ namespace NzbDrone.Core.Test.Framework
             return database;
         }
 
-        public static void CreateDataBaseTemplate()
+        internal static void CreateDataBaseTemplate()
         {
             Console.WriteLine("Creating an empty PetaPoco database");
             var connectionString = Connection.GetConnectionString(DB_TEMPLATE_NAME);
             var database = Connection.GetPetaPocoDb(connectionString);
             database.Dispose();
         }
-
-        public static Series GetFakeSeries(int id, string title)
-        {
-            return Builder<Series>.CreateNew()
-                .With(c => c.SeriesId = id)
-                .With(c => c.Title = title)
-                .With(c => c.CleanTitle = Parser.NormalizeTitle(title))
-                .Build();
-        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs
index f907b63ec..17d2a2c12 100644
--- a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs
@@ -3,14 +3,12 @@ using System.Linq;
 
 using FizzWare.NBuilder;
 using FluentAssertions;
-using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
 
 // ReSharper disable InconsistentNaming
 namespace NzbDrone.Core.Test.ProviderTests
@@ -134,14 +132,16 @@ namespace NzbDrone.Core.Test.ProviderTests
         {
             WithRealDb();
 
-            Db.Insert(TestDbHelper.GetFakeSeries(1, "MyTitle"));
+            var fakeSEries = Builder<Series>.CreateNew()
+                                                .Build();
+
+            Db.Insert(fakeSEries);
+
             //Act
             var seriesProvider = Mocker.Resolve<SeriesProvider>();
-            var series = seriesProvider.FindSeries("WrongTitle");
-
 
             //Assert
-            Assert.IsNull(series);
+            seriesProvider.FindSeries("WrongTitle").Should().BeNull();
         }
 
         [TestCase("The Test", "Test")]
@@ -150,19 +150,25 @@ namespace NzbDrone.Core.Test.ProviderTests
         {
             WithRealDb();
 
-            Db.Insert(TestDbHelper.GetFakeSeries(1, title));
-            Db.Insert(Builder<QualityProfile>.CreateNew().Build());
-            Mocker.Resolve<QualityProvider>();
+            var fakeSeries = Builder<Series>.CreateNew()
+                .With(c => c.Title = title)
+                .With(c => c.CleanTitle = Parser.NormalizeTitle(title))
+                .Build();
+
+            var fakeQuality = Builder<QualityProfile>.CreateNew()
+                                    .With(c => c.QualityProfileId = fakeSeries.QualityProfileId)
+                                    .Build();
+
+            Db.Insert(fakeSeries);
+            Db.Insert(fakeQuality);
 
             //Act
-            var seriesProvider = Mocker.Resolve<SeriesProvider>();
-            var series = seriesProvider.FindSeries(searchTitle);
+            var series = Mocker.Resolve<SeriesProvider>().FindSeries(searchTitle);
 
             //Assert
-            Assert.IsNotNull(series);
-            Assert.AreEqual(title, series.Title);
-            series.QualityProfile.Should().NotBeNull();
-            series.QualityProfile.ShouldHave().Properties(q => q.Name, q => q.SonicAllowed, q => q.Cutoff, q => q.AllowedString);
+            series.Should().NotBeNull();
+            series.SeriesId.Should().Be(series.SeriesId);
+            series.Title.Should().BeEquivalentTo(series.Title);
         }
 
         [Test]
@@ -651,7 +657,7 @@ namespace NzbDrone.Core.Test.ProviderTests
         [Test]
         public void SearchForSeries_should_not_return_results_that_do_not_contain_the_query()
         {
-           WithRealDb();
+            WithRealDb();
 
             var fakeQuality = Builder<QualityProfile>.CreateNew().Build();
             var fakeSeries = Builder<Series>.CreateListOfSize(10)