diff --git a/NzbDrone.Core.Test/ConfigProviderTest.cs b/NzbDrone.Core.Test/ConfigProviderTest.cs
index bc2805f40..342b3e00f 100644
--- a/NzbDrone.Core.Test/ConfigProviderTest.cs
+++ b/NzbDrone.Core.Test/ConfigProviderTest.cs
@@ -1,11 +1,9 @@
 using AutoMoq;
 using FluentAssertions;
-using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/DiskScanJobTest.cs b/NzbDrone.Core.Test/DiskScanJobTest.cs
index 5177c5eb6..bd1e82e44 100644
--- a/NzbDrone.Core.Test/DiskScanJobTest.cs
+++ b/NzbDrone.Core.Test/DiskScanJobTest.cs
@@ -1,8 +1,6 @@
 // ReSharper disable RedundantUsingDirective
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using System.Threading;
 using AutoMoq;
 using FizzWare.NBuilder;
 using Moq;
diff --git a/NzbDrone.Core.Test/DownloadProviderTest.cs b/NzbDrone.Core.Test/DownloadProviderTest.cs
index 049c15b40..9c24890ff 100644
--- a/NzbDrone.Core.Test/DownloadProviderTest.cs
+++ b/NzbDrone.Core.Test/DownloadProviderTest.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using AutoMoq;
 using FizzWare.NBuilder;
 using Moq;
diff --git a/NzbDrone.Core.Test/EpisodeProviderTest.cs b/NzbDrone.Core.Test/EpisodeProviderTest.cs
index 64c634a9e..16289c50f 100644
--- a/NzbDrone.Core.Test/EpisodeProviderTest.cs
+++ b/NzbDrone.Core.Test/EpisodeProviderTest.cs
@@ -1,20 +1,16 @@
 // ReSharper disable RedundantUsingDirective
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using System.Linq.Expressions;
+using System.Linq;
 using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
-using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
 using PetaPoco;
-using SubSonic.Repository;
 using TvdbLib.Data;
 
 namespace NzbDrone.Core.Test
diff --git a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
index d2f9cab5d..4d31e398e 100644
--- a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
+++ b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
@@ -1,9 +1,8 @@
 // ReSharper disable RedundantUsingDirective
+using System;
 using AutoMoq;
 using Moq;
-using System;
 using NUnit.Framework;
-using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/Framework/ExceptionVerification.cs b/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
index 801b75c60..6cbabaf2d 100644
--- a/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
+++ b/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
@@ -1,7 +1,7 @@
 // ReSharper disable RedundantUsingDirective
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using NLog;
 using NLog.Targets;
 using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/Framework/MockLib.cs b/NzbDrone.Core.Test/Framework/MockLib.cs
index 7c97b627f..4ed4ea6c5 100644
--- a/NzbDrone.Core.Test/Framework/MockLib.cs
+++ b/NzbDrone.Core.Test/Framework/MockLib.cs
@@ -6,13 +6,10 @@ using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using PetaPoco;
-using SubSonic.DataProviders;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test.Framework
 {
@@ -95,12 +92,5 @@ namespace NzbDrone.Core.Test.Framework
                 .WhereAll().Have(c => c.EpisodeNumber = epNumber.Generate())
                 .Build();
         }
-
-        private static void ForceMigration(IRepository repository)
-        {
-            repository.All<EpisodeFile>().Count();
-            repository.All<QualityProfile>().Count();
-            repository.All<History>().Count();
-        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/Framework/TestBase.cs b/NzbDrone.Core.Test/Framework/TestBase.cs
index 194e78fdd..53f2c57b6 100644
--- a/NzbDrone.Core.Test/Framework/TestBase.cs
+++ b/NzbDrone.Core.Test/Framework/TestBase.cs
@@ -1,5 +1,4 @@
-using NUnit;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace NzbDrone.Core.Test.Framework
 {
diff --git a/NzbDrone.Core.Test/HistoryProviderTest.cs b/NzbDrone.Core.Test/HistoryProviderTest.cs
index 2ea187452..b7c405de4 100644
--- a/NzbDrone.Core.Test/HistoryProviderTest.cs
+++ b/NzbDrone.Core.Test/HistoryProviderTest.cs
@@ -1,6 +1,5 @@
 // ReSharper disable RedundantUsingDirective
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using AutoMoq;
 using FizzWare.NBuilder;
@@ -11,7 +10,6 @@ using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
index b37594ac6..30e96b40f 100644
--- a/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
+++ b/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
@@ -1,7 +1,6 @@
 // ReSharper disable RedundantUsingDirective
-using System.Linq;
+using System;
 using System.Collections.Generic;
-using System.Threading;
 using AutoMoq;
 using FizzWare.NBuilder;
 using Moq;
@@ -11,7 +10,6 @@ using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
-using System;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/IndexerProviderTest.cs b/NzbDrone.Core.Test/IndexerProviderTest.cs
index b50afa716..c6e0cdf59 100644
--- a/NzbDrone.Core.Test/IndexerProviderTest.cs
+++ b/NzbDrone.Core.Test/IndexerProviderTest.cs
@@ -1,22 +1,16 @@
 // ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.ServiceModel.Syndication;
 using AutoMoq;
-using FizzWare.NBuilder;
-using Moq;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Providers.Indexer;
-using NzbDrone.Core.Repository;
-using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
-using FluentAssertions;
 
 namespace NzbDrone.Core.Test
 {
@@ -158,7 +152,7 @@ namespace NzbDrone.Core.Test
             return "http://www.google.com";
         }
 
-        protected override Model.EpisodeParseResult CustomParser(SyndicationItem item, Model.EpisodeParseResult currentResult)
+        protected override EpisodeParseResult CustomParser(SyndicationItem item, EpisodeParseResult currentResult)
         {
             if (currentResult == null) currentResult = new EpisodeParseResult();
             currentResult.Language = LanguageType.Finnish;
diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs
index fce620b40..6aceb5c0e 100644
--- a/NzbDrone.Core.Test/IndexerTests.cs
+++ b/NzbDrone.Core.Test/IndexerTests.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.ServiceModel.Syndication;
-using System.Text;
 using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
diff --git a/NzbDrone.Core.Test/InventoryProvider_IsMonitoredTest.cs b/NzbDrone.Core.Test/InventoryProvider_IsMonitoredTest.cs
index b27526b7a..0197d94f6 100644
--- a/NzbDrone.Core.Test/InventoryProvider_IsMonitoredTest.cs
+++ b/NzbDrone.Core.Test/InventoryProvider_IsMonitoredTest.cs
@@ -1,9 +1,6 @@
 // ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.ServiceModel.Syndication;
 using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -11,9 +8,6 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.ExternalNotification;
-using NzbDrone.Core.Providers.Indexer;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/LogProviderTest.cs b/NzbDrone.Core.Test/LogProviderTest.cs
index f1066e91e..9d8490e7a 100644
--- a/NzbDrone.Core.Test/LogProviderTest.cs
+++ b/NzbDrone.Core.Test/LogProviderTest.cs
@@ -1,17 +1,13 @@
 // ReSharper disable RedundantUsingDirective
 using System;
 using System.Linq;
-using FizzWare.NBuilder;
 using FluentAssertions;
 using NLog;
 using NLog.Config;
 using NUnit.Framework;
-using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Instrumentation;
-using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 
-
 namespace NzbDrone.Core.Test
 {
     [TestFixture]
diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs
index 124da51b6..97af1d265 100644
--- a/NzbDrone.Core.Test/MediaFileProviderTests.cs
+++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs
@@ -2,8 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq.Expressions;
 using System.Linq;
+using System.Linq.Expressions;
 using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -18,7 +18,6 @@ using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
 using PetaPoco;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test
 {
@@ -213,10 +212,10 @@ namespace NzbDrone.Core.Test
             //Mocks
             var mocker = new AutoMoqer();
 
-            mocker.GetMock<IRepository>()
-                .Setup(r => r.Exists(It.IsAny<Expression<Func<EpisodeFile, Boolean>>>())).Returns(false).Verifiable();
-            mocker.GetMock<IRepository>()
-                .Setup(r => r.Add(It.IsAny<EpisodeFile>())).Returns(0).Verifiable();
+            mocker.GetMock<IDatabase>()
+                .Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>())).Returns(false).Verifiable();
+            mocker.GetMock<IDatabase>()
+                .Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(0).Verifiable();
 
             mocker.GetMock<EpisodeProvider>()
                 .Setup(e => e.GetEpisode(fakeSeries.SeriesId, airDate)).Returns(fakeEpisode).
@@ -299,7 +298,7 @@ namespace NzbDrone.Core.Test
             //Assert
             mocker.VerifyAllMocks();
             Assert.IsNull(result);
-            mocker.GetMock<IRepository>().Verify(r => r.Add(result), Times.Never());
+            mocker.GetMock<IDatabase>().Verify(r => r.Insert(result), Times.Never());
             ExceptionVerification.ExcpectedWarns(1);
         }
 
diff --git a/NzbDrone.Core.Test/MediaFileProvider_GetNewFilenameTest.cs b/NzbDrone.Core.Test/MediaFileProvider_GetNewFilenameTest.cs
index 9e059e798..6ec6da471 100644
--- a/NzbDrone.Core.Test/MediaFileProvider_GetNewFilenameTest.cs
+++ b/NzbDrone.Core.Test/MediaFileProvider_GetNewFilenameTest.cs
@@ -1,13 +1,8 @@
 // ReSharper disable RedundantUsingDirective
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using AutoMoq;
 using FizzWare.NBuilder;
-using Moq;
 using NUnit.Framework;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/MediaFileProvider_ImportNewDownloadTest.cs b/NzbDrone.Core.Test/MediaFileProvider_ImportNewDownloadTest.cs
index 530bf3abe..c3a46ab16 100644
--- a/NzbDrone.Core.Test/MediaFileProvider_ImportNewDownloadTest.cs
+++ b/NzbDrone.Core.Test/MediaFileProvider_ImportNewDownloadTest.cs
@@ -1,19 +1,13 @@
 // ReSharper disable RedundantUsingDirective
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq.Expressions;
-using System.Linq;
 using AutoMoq;
 using FizzWare.NBuilder;
-using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 13f90581c..f6bb8d9da 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -75,7 +75,6 @@
     <Reference Include="pnunit.framework">
       <HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="SubSonic.Core, Version=3.0.0.3, Culture=neutral, processorArchitecture=x86" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
diff --git a/NzbDrone.Core.Test/QualityProfileTest.cs b/NzbDrone.Core.Test/QualityProfileTest.cs
index 773dc524b..292daedca 100644
--- a/NzbDrone.Core.Test/QualityProfileTest.cs
+++ b/NzbDrone.Core.Test/QualityProfileTest.cs
@@ -1,7 +1,6 @@
 // ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
diff --git a/NzbDrone.Core.Test/QualityTest.cs b/NzbDrone.Core.Test/QualityTest.cs
index af41c12ae..63bedfea7 100644
--- a/NzbDrone.Core.Test/QualityTest.cs
+++ b/NzbDrone.Core.Test/QualityTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using FluentAssertions;
-using NUnit.Framework;
+using NUnit.Framework;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/RootDirProviderTest.cs b/NzbDrone.Core.Test/RootDirProviderTest.cs
index e00c606bb..7b492462c 100644
--- a/NzbDrone.Core.Test/RootDirProviderTest.cs
+++ b/NzbDrone.Core.Test/RootDirProviderTest.cs
@@ -9,7 +9,6 @@ using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/SceneMappingTest.cs b/NzbDrone.Core.Test/SceneMappingTest.cs
index f5d49708c..a7a69eb52 100644
--- a/NzbDrone.Core.Test/SceneMappingTest.cs
+++ b/NzbDrone.Core.Test/SceneMappingTest.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using AutoMoq;
+using AutoMoq;
 using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
 using NUnit.Framework;
-using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
-using SubSonic.Repository;
-using TvdbLib.Data;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index 90a52b176..784ca2e17 100644
Binary files a/NzbDrone.Core.Test/SeriesProviderTest.cs and b/NzbDrone.Core.Test/SeriesProviderTest.cs differ
diff --git a/NzbDrone.Core.Test/TvDbProviderTest.cs b/NzbDrone.Core.Test/TvDbProviderTest.cs
index 5dba84448..4930a5bba 100644
--- a/NzbDrone.Core.Test/TvDbProviderTest.cs
+++ b/NzbDrone.Core.Test/TvDbProviderTest.cs
@@ -1,16 +1,16 @@
 // ReSharper disable RedundantUsingDirective
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Test.Framework;
 using TvdbLib.Data;
-using System.Collections.Generic;
 
 namespace NzbDrone.Core.Test
 {
-    [NUnit.Framework.TestFixture]
+    [TestFixture]
     // ReSharper disable InconsistentNaming
     public class TvDbProviderTest : TestBase
     {
diff --git a/NzbDrone.Core.Test/UpcomingEpisodesProviderTest.cs b/NzbDrone.Core.Test/UpcomingEpisodesProviderTest.cs
index 3d674b252..f6a5f9947 100644
--- a/NzbDrone.Core.Test/UpcomingEpisodesProviderTest.cs
+++ b/NzbDrone.Core.Test/UpcomingEpisodesProviderTest.cs
@@ -1,15 +1,10 @@
 // ReSharper disable RedundantUsingDirective
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using AutoMoq;
 using FizzWare.NBuilder;
-using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
-using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test
diff --git a/NzbDrone.Core.Test/dbBenchmark.cs b/NzbDrone.Core.Test/dbBenchmark.cs
index c6c3b125c..7ca88b1b9 100644
--- a/NzbDrone.Core.Test/dbBenchmark.cs
+++ b/NzbDrone.Core.Test/dbBenchmark.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
+using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
-using SubSonic.Repository;
 
 namespace NzbDrone.Core.Test
 {
@@ -139,7 +139,7 @@ namespace NzbDrone.Core.Test
         [Test]
         public void get_episode_file_count_x100()
         {
-            var mocker = new AutoMoq.AutoMoqer();
+            var mocker = new AutoMoqer();
             //mocker.SetConstant(repo);
             mocker.SetConstant(mocker.Resolve<EpisodeProvider>());
             var mediaProvider = mocker.Resolve<MediaFileProvider>();
@@ -167,7 +167,7 @@ namespace NzbDrone.Core.Test
         [Test]
         public void get_season_count_x5000()
         {
-            var mocker = new AutoMoq.AutoMoqer();
+            var mocker = new AutoMoqer();
             //mocker.SetConstant(repo);
             var provider = mocker.Resolve<EpisodeProvider>();
 
@@ -194,7 +194,7 @@ namespace NzbDrone.Core.Test
         [Test]
         public void get_episode_file_count_x10()
         {
-            var mocker = new AutoMoq.AutoMoqer();
+            var mocker = new AutoMoqer();
             //mocker.SetConstant(repo);
             mocker.SetConstant(mocker.Resolve<EpisodeProvider>());
             var provider = mocker.Resolve<MediaFileProvider>();