diff --git a/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
index 16a7bcd9c..f4a429b24 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
@@ -80,7 +80,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -101,7 +101,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -143,7 +143,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -164,7 +164,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -185,7 +185,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -206,7 +206,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -227,7 +227,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(false);
 
@@ -248,7 +248,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -269,7 +269,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -290,7 +290,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -311,7 +311,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -333,7 +333,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -355,7 +355,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
@@ -378,7 +378,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             Mocker.GetMock<QualityTypeProvider>().Setup(s => s.Get(1)).Returns(qualityType);
 
-            Mocker.GetMock<EpisodeService>().Setup(
+            Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.IsFirstOrLastEpisodeOfSeason(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>()))
                 .Returns(true);
 
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
index cb5183a33..230164b81 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
@@ -59,8 +59,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var singleEpisodeList = new List<Episode> { firstEpisode };
             var doubleEpisodeList = new List<Episode> { firstEpisode, secondEpisode };
 
-            Mocker.GetMock<EpisodeService>().Setup(c => c.GetEpisodesByParseResult(parseResultSingle)).Returns(singleEpisodeList);
-            Mocker.GetMock<EpisodeService>().Setup(c => c.GetEpisodesByParseResult(parseResultMulti)).Returns(doubleEpisodeList);
+            Mocker.GetMock<IEpisodeService>().Setup(c => c.GetEpisodesByParseResult(parseResultSingle)).Returns(singleEpisodeList);
+            Mocker.GetMock<IEpisodeService>().Setup(c => c.GetEpisodesByParseResult(parseResultMulti)).Returns(doubleEpisodeList);
 
             Mocker.GetMock<ISeriesRepository>().Setup(c => c.GetByTitle(parseResultMulti.CleanTitle)).Returns(fakeSeries);
             Mocker.GetMock<ISeriesRepository>().Setup(c => c.GetByTitle(parseResultSingle.CleanTitle)).Returns(fakeSeries);
diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
index f743a1a83..f87efcbfb 100644
--- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Test.JobTests
             WithStrictMocker();
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             Mocker.GetMock<EpisodeSearchJob>()
@@ -99,7 +99,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -129,10 +129,10 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
 
             //Act
@@ -163,10 +163,10 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(episodes.Select(e => e.EpisodeNumber).ToList());
 
             //Act
@@ -205,10 +205,10 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.GetEpisodeNumbersBySeason(1, 1)).Returns(new List<int> { 1, 2, 3, 4, 5 });
 
             //Act
@@ -246,7 +246,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -285,7 +285,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             //WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -325,7 +325,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
diff --git a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
index d3c21adc4..ee2f4518e 100644
--- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.JobTests
             //Setup
             var episodes = new List<Episode>();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Test.JobTests
                 .With(e => e.AirDate = DateTime.Today.AddDays(-35))
                 .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             Mocker.GetMock<EpisodeSearchJob>().Setup(c => c.Start(It.IsAny<ProgressNotification>(), It.Is<object>(d => d.GetPropertyValue<int>("EpisodeId") >= 0)));
@@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -161,7 +161,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             //WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
@@ -201,7 +201,7 @@ namespace NzbDrone.Core.Test.JobTests
 
             WithEnableBacklogSearching();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(s => s.EpisodesWithoutFiles(true)).Returns(episodes);
 
             //Act
diff --git a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
index 0ac909d70..678e8b7de 100644
--- a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.JobTests
                  .With(e => e.AirDate = DateTime.Today.AddDays(-1))
                  .Build();
 
-             Mocker.GetMock<EpisodeService>()
+             Mocker.GetMock<IEpisodeService>()
                  .Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(_episodes);
         }
 
@@ -92,7 +92,7 @@ namespace NzbDrone.Core.Test.JobTests
                 .With(e => e.AirDate = DateTime.Today.AddDays(2))
                 .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
 
             Mocker.GetMock<SearchProvider>()
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
index 3be624d2e..a14289078 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
@@ -103,7 +103,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             Mocker.GetMock<ISeriesRepository>().Setup(s => s.Get(It.IsAny<int>()))
                 .Returns(series);
 
-            Mocker.GetMock<EpisodeService>().Setup(s => s.GetEpisodesByFileId(episodeFile.EpisodeFileId))
+            Mocker.GetMock<IEpisodeService>().Setup(s => s.GetEpisodesByFileId(episodeFile.EpisodeFileId))
                     .Returns(episode);
 
             Mocker.GetMock<MediaFileProvider>().Setup(s => s.GetNewFilename(It.IsAny<IList<Episode>>(), series, QualityTypes.Unknown, false, It.IsAny<EpisodeFile>()))
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
index a624b544e..4c12a4d58 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(e => e.FileExists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByFileId(It.IsAny<int>()))
                 .Returns(new List<Episode>());
 
@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             //Assert
             Mocker.VerifyAllMocks();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                .Verify(e => e.GetEpisodesByFileId(It.IsAny<int>()), Times.Exactly(10));
 
             Mocker.GetMock<MediaFileProvider>()
@@ -80,11 +80,11 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(e => e.FileExists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByFileId(It.IsAny<int>()))
                 .Returns(new List<Episode> { new Episode { EpisodeFile = new EpisodeFile { EpisodeFileId = 10 } }, new Episode { EpisodeFile = new EpisodeFile { EpisodeFileId = 10 } } });
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.UpdateEpisode(It.IsAny<Episode>()));
 
             Mocker.GetMock<MediaFileProvider>()
@@ -100,10 +100,10 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             //Assert
             Mocker.VerifyAllMocks();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                .Verify(e => e.GetEpisodesByFileId(It.IsAny<int>()), Times.Exactly(10));
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(e => e.UpdateEpisode(It.Is<Episode>(g => g.EpisodeFileId == 0)), Times.Exactly(20));
 
             Mocker.GetMock<MediaFileProvider>()
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
index bf6d88002..81c0797ee 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             //Act
@@ -94,7 +94,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
 
             With80MBFile();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             //Act
@@ -124,7 +124,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             //Act
@@ -194,7 +194,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                   .Setup(p => p.Exists(It.IsAny<String>()))
                   .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
                 .Returns(new List<Episode>());
 
@@ -225,7 +225,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             //Act
@@ -257,7 +257,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(fakeEpisodes);
 
             //Act
@@ -290,7 +290,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(fakeEpisodes);
 
             //Act
@@ -328,7 +328,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode1, fakeEpisode2 });
 
             //Act
@@ -357,7 +357,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(p => p.Exists(It.IsAny<String>()))
                 .Returns(false);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode});
 
             //Act
@@ -380,7 +380,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             
             With80MBFile();
 
-            Mocker.GetMock<EpisodeService>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
+            Mocker.GetMock<IEpisodeService>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
                 .Returns(new List<Episode>());
 
             Mocker.GetMock<DiskProvider>().Setup(s => s.IsChildOfPath(path, series.Path))
@@ -388,7 +388,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
 
             Mocker.Resolve<DiskScanProvider>().ImportFile(series, path);
 
-            Mocker.Verify<EpisodeService>(s => s.GetEpisodesByParseResult(It.Is<EpisodeParseResult>(p => p.SceneSource)), Times.Once());
+            Mocker.Verify<IEpisodeService>(s => s.GetEpisodesByParseResult(It.Is<EpisodeParseResult>(p => p.SceneSource)), Times.Once());
         }
 
         [Test]
@@ -403,7 +403,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
 
             With80MBFile();
 
-            Mocker.GetMock<EpisodeService>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
+            Mocker.GetMock<IEpisodeService>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
                 .Returns(new List<Episode>());
 
             Mocker.GetMock<DiskProvider>().Setup(s => s.IsChildOfPath(path, series.Path))
@@ -411,7 +411,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
 
             Mocker.Resolve<DiskScanProvider>().ImportFile(series, path);
 
-            Mocker.Verify<EpisodeService>(s => s.GetEpisodesByParseResult(It.Is<EpisodeParseResult>(p => p.SceneSource == false)), Times.Once());
+            Mocker.Verify<IEpisodeService>(s => s.GetEpisodesByParseResult(It.Is<EpisodeParseResult>(p => p.SceneSource == false)), Times.Once());
         }
 
         [Test]
@@ -454,7 +454,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                   .Setup(s => s.GetRunTime(path))
                   .Returns(600);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             var result = Mocker.Resolve<DiskScanProvider>().ImportFile(_series, path);
@@ -481,7 +481,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                   .Setup(s => s.GetRunTime(path))
                   .Returns(60);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             var result = Mocker.Resolve<DiskScanProvider>().ImportFile(_series, path);
@@ -512,7 +512,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                   .Setup(s => s.GetRunTime(path))
                   .Returns(60);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
 
             var result = Mocker.Resolve<DiskScanProvider>().ImportFile(_series, path);
@@ -552,16 +552,16 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             Mocker.GetMock<MediaFileProvider>().Verify(p => p.Add(It.IsAny<EpisodeFile>()), Times.Once());
 
             //Get the count of episodes linked
-            var count = Mocker.GetMock<EpisodeService>().Object.GetEpisodesByParseResult(null).Count;
+            var count = Mocker.GetMock<IEpisodeService>().Object.GetEpisodesByParseResult(null).Count;
 
-            Mocker.GetMock<EpisodeService>().Verify(p => p.UpdateEpisode(It.Is<Episode>(e => e.EpisodeFileId == result.EpisodeFileId)), Times.Exactly(count));
+            Mocker.GetMock<IEpisodeService>().Verify(p => p.UpdateEpisode(It.Is<Episode>(e => e.EpisodeFileId == result.EpisodeFileId)), Times.Exactly(count));
         }
 
         private static void VerifySkipImport(EpisodeFile result, AutoMoqer Mocker)
         {
             result.Should().BeNull();
             Mocker.GetMock<MediaFileProvider>().Verify(p => p.Add(It.IsAny<EpisodeFile>()), Times.Never());
-            Mocker.GetMock<EpisodeService>().Verify(p => p.UpdateEpisode(It.IsAny<Episode>()), Times.Never());
+            Mocker.GetMock<IEpisodeService>().Verify(p => p.UpdateEpisode(It.IsAny<Episode>()), Times.Never());
             Mocker.GetMock<DiskProvider>().Verify(p => p.DeleteFile(It.IsAny<string>()), Times.Never());
         }
     }
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
index 75e0ec1e3..e4a481d52 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(e => e.Get(fakeSeries.SeriesId))
                 .Returns(fakeSeries);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByFileId(file.EpisodeFileId))
                 .Returns(fakeEpisode);
 
@@ -100,7 +100,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                   .Setup(e => e.Get(fakeSeries.SeriesId))
                   .Returns(fakeSeries);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                   .Setup(e => e.GetEpisodesByFileId(file.EpisodeFileId))
                   .Returns(fakeEpisode);
 
@@ -163,7 +163,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
                 .Setup(e => e.Get(fakeSeries.SeriesId))
                 .Returns(fakeSeries);
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(e => e.GetEpisodesByFileId(file.EpisodeFileId))
                 .Returns(fakeEpisode);
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
index 9407f84d3..3bc9cdb15 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
             Mocker.GetMock<ISeriesRepository>()
                 .Setup(c => c.Update(It.Is<Series>(s => s.LastDiskSync != null))).Verifiable();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.GetEpisodeBySeries(It.IsAny<int>()))
                 .Returns(new List<Episode> { new Episode() });
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
index d441db880..6500681b4 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadProviderTests
                             .All().With(s => s.SeriesId = 5)
                             .Build().ToList();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                     .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())).Returns(episodes);
 
             return Builder<EpisodeParseResult>.CreateNew()
@@ -104,10 +104,10 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadProviderTests
             Mocker.GetMock<HistoryProvider>()
                 .Verify(s => s.Add(It.Is<History>(h => h.EpisodeId == 99 && h.SeriesId == 5)), Times.Once());
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(c => c.MarkEpisodeAsFetched(12));
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(c => c.MarkEpisodeAsFetched(99));
 
             Mocker.GetMock<ExternalNotificationProvider>()
@@ -139,10 +139,10 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadProviderTests
             Mocker.GetMock<HistoryProvider>()
                 .Verify(s => s.Add(It.Is<History>(h => h.EpisodeId == 99 && h.SeriesId == 5)), Times.Once());
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(c => c.MarkEpisodeAsFetched(12));
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(c => c.MarkEpisodeAsFetched(99));
 
             Mocker.GetMock<ExternalNotificationProvider>()
@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DownloadProviderTests
                 .Verify(s => s.Add(It.IsAny<History>()), Times.Never());
 
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Verify(c => c.MarkEpisodeAsFetched(It.IsAny<int>()), Times.Never());
 
             Mocker.GetMock<ExternalNotificationProvider>()
diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
index c85e2409b..be8eb7a37 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Test.ProviderTests
         {
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.GetEpisodeBySeries(12))
                 .Returns(new List<Episode>());
 
diff --git a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
index 53514b2cf..f66716ac0 100644
--- a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.ProviderTests.Metadata
                     .With(e => e.EpisodeNumber = 1)
                     .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                         .Setup(s => s.GetEpisodesByFileId(episodeFile.EpisodeFileId))
                         .Returns(new List<Episode> { episode });
         }
@@ -117,7 +117,7 @@ namespace NzbDrone.Core.Test.ProviderTests.Metadata
                     .With(e => e.SeasonNumber = 1)
                     .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                         .Setup(s => s.GetEpisodesByFileId(episodeFile.EpisodeFileId))
                         .Returns(episodes.ToList());
         }
diff --git a/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
index 057692518..3f7c2f3e0 100644
--- a/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Test.ProviderTests
 
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.EpisodesWithFiles()).Returns(episodes);
 
             Mocker.GetMock<MediaFileProvider>()
@@ -91,7 +91,7 @@ namespace NzbDrone.Core.Test.ProviderTests
 
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.EpisodesWithFiles()).Returns(episodes);
 
             Mocker.GetMock<MediaFileProvider>()
@@ -138,7 +138,7 @@ namespace NzbDrone.Core.Test.ProviderTests
 
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.EpisodesWithFiles()).Returns(episodes);
 
             Mocker.GetMock<MediaFileProvider>()
@@ -187,7 +187,7 @@ namespace NzbDrone.Core.Test.ProviderTests
 
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.EpisodesWithFiles()).Returns(episodes);
 
             Mocker.GetMock<MediaFileProvider>()
@@ -236,7 +236,7 @@ namespace NzbDrone.Core.Test.ProviderTests
 
             WithStrictMocker();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                 .Setup(c => c.EpisodesWithFiles()).Returns(episodes);
 
             Mocker.GetMock<MediaFileProvider>()
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
index 332c4c8d7..1fc3ef8eb 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests
                     .CreateListOfSize(1)
                     .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                   .Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
                   .Returns(_episodes);
         }
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
index 5c7b1c12c..972d16995 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchTests
     {
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public TestSearch(ISeriesService seriesService, EpisodeService episodeService, DownloadProvider downloadProvider, 
+        public TestSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, 
                           IndexerService indexerService, SceneMappingProvider sceneMappingProvider,
                           AllowedDownloadSpecification allowedDownloadSpecification, SearchHistoryProvider searchHistoryProvider,ISeriesRepository seriesRepository)
                           : base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingProvider, 
diff --git a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
index e67ea7607..6604151cf 100644
--- a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.ProviderTests.TvRageMappingProviderTests
                     .With(s => s.UtcOffset = -8)
                     .Build();
 
-            Mocker.GetMock<EpisodeService>()
+            Mocker.GetMock<IEpisodeService>()
                   .Setup(s => s.GetEpisode(_series.SeriesId, 1, 1))
                   .Returns(_episode);
 
diff --git a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
index ac115f094..affa46fd2 100644
--- a/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests
     // ReSharper disable InconsistentNaming
     public class EpisodeProviderTest_GetEpisodesByParseResult : SqlCeTest
     {
-        private EpisodeService episodeService;
+        private IEpisodeService episodeService;
 
         private Series fakeSeries;
         private Series fakeDailySeries;
diff --git a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
index dafff152e..8947f86d2 100644
--- a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
@@ -10,10 +10,10 @@ namespace NzbDrone.Core.DecisionEngine
     public class AcceptableSizeSpecification
     {
         private readonly QualityTypeProvider _qualityTypeProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public AcceptableSizeSpecification(QualityTypeProvider qualityTypeProvider, EpisodeService episodeService)
+        public AcceptableSizeSpecification(QualityTypeProvider qualityTypeProvider, IEpisodeService episodeService)
         {
             _qualityTypeProvider = qualityTypeProvider;
             _episodeService = episodeService;
diff --git a/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
index 464f48116..00385dad4 100644
--- a/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
@@ -8,11 +8,11 @@ namespace NzbDrone.Core.DecisionEngine
 {
     public class MonitoredEpisodeSpecification
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly ISeriesRepository _seriesRepository;
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public MonitoredEpisodeSpecification(EpisodeService episodeService, ISeriesRepository seriesRepository)
+        public MonitoredEpisodeSpecification(IEpisodeService episodeService, ISeriesRepository seriesRepository)
         {
             _episodeService = episodeService;
             _seriesRepository = seriesRepository;
diff --git a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
index a3c3f78dd..6f1050180 100644
--- a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
@@ -8,12 +8,12 @@ namespace NzbDrone.Core.DecisionEngine
 {
     public class UpgradeHistorySpecification
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly HistoryProvider _historyProvider;
         private readonly QualityUpgradeSpecification _qualityUpgradeSpecification;
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public UpgradeHistorySpecification(EpisodeService episodeService, HistoryProvider historyProvider, QualityUpgradeSpecification qualityUpgradeSpecification)
+        public UpgradeHistorySpecification(IEpisodeService episodeService, HistoryProvider historyProvider, QualityUpgradeSpecification qualityUpgradeSpecification)
         {
             _episodeService = episodeService;
             _historyProvider = historyProvider;
diff --git a/NzbDrone.Core/Jobs/BacklogSearchJob.cs b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
index da0b2666c..2103c71e2 100644
--- a/NzbDrone.Core/Jobs/BacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
@@ -13,14 +13,14 @@ namespace NzbDrone.Core.Jobs
 {
     public class BacklogSearchJob : IJob
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly EpisodeSearchJob _episodeSearchJob;
         private readonly SeasonSearchJob _seasonSearchJob;
         private readonly ConfigProvider _configProvider;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public BacklogSearchJob(EpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
+        public BacklogSearchJob(IEpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
                                     SeasonSearchJob seasonSearchJob, ConfigProvider configProvider)
         {
             _episodeService = episodeService;
diff --git a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
index 12e8d00c5..4aaa8e6ea 100644
--- a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
+++ b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
@@ -13,12 +13,12 @@ namespace NzbDrone.Core.Jobs
     {
         private readonly HandbrakeProvider _handbrakeProvider;
         private readonly AtomicParsleyProvider _atomicParsleyProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public ConvertEpisodeJob(HandbrakeProvider handbrakeProvider, AtomicParsleyProvider atomicParsleyProvider,
-                                    EpisodeService episodeService)
+                                    IEpisodeService episodeService)
         {
             _handbrakeProvider = handbrakeProvider;
             _atomicParsleyProvider = atomicParsleyProvider;
diff --git a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
index ff09c7e84..4021f4a97 100644
--- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
+++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
@@ -12,14 +12,14 @@ namespace NzbDrone.Core.Jobs
 {
     public class EpisodeSearchJob : IJob
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly UpgradePossibleSpecification _upgradePossibleSpecification;
         private readonly EpisodeSearch _episodeSearch;
         private readonly DailyEpisodeSearch _dailyEpisodeSearch;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public EpisodeSearchJob(EpisodeService episodeService, UpgradePossibleSpecification upgradePossibleSpecification,
+        public EpisodeSearchJob(IEpisodeService episodeService, UpgradePossibleSpecification upgradePossibleSpecification,
                                 EpisodeSearch episodeSearch, DailyEpisodeSearch dailyEpisodeSearch)
         {
             if(dailyEpisodeSearch == null) throw new ArgumentNullException("dailyEpisodeSearch");
diff --git a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
index 4b924639d..2eaf12cfa 100644
--- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Jobs
     public class ImportNewSeriesJob : IJob
     {
         private readonly ISeriesService _seriesService;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly MediaFileProvider _mediaFileProvider;
         private readonly UpdateInfoJob _updateInfoJob;
         private readonly DiskScanJob _diskScanJob;
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Jobs
 
         private List<int> _attemptedSeries;
 
-        public ImportNewSeriesJob(ISeriesService seriesService, EpisodeService episodeService,
+        public ImportNewSeriesJob(ISeriesService seriesService, IEpisodeService episodeService,
                                     MediaFileProvider mediaFileProvider, UpdateInfoJob updateInfoJob,
                                     DiskScanJob diskScanJob, BannerDownloadJob bannerDownloadJob,
                                     ISeasonRepository seasonRepository, XemUpdateJob xemUpdateJob, ISeriesRepository seriesRepository,ISeasonService seasonService)
diff --git a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
index 4ce9205eb..a0944770b 100644
--- a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
@@ -13,13 +13,13 @@ namespace NzbDrone.Core.Jobs
 {
     public class PastWeekBacklogSearchJob : IJob
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly EpisodeSearchJob _episodeSearchJob;
         private readonly ConfigProvider _configProvider;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public PastWeekBacklogSearchJob(EpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
+        public PastWeekBacklogSearchJob(IEpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
                                             ConfigProvider configProvider)
         {
             _episodeService = episodeService;
diff --git a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
index 089348420..e5fad085e 100644
--- a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
@@ -13,13 +13,13 @@ namespace NzbDrone.Core.Jobs
 {
     public class RecentBacklogSearchJob : IJob
     {
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly EpisodeSearchJob _episodeSearchJob;
         private readonly ConfigProvider _configProvider;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public RecentBacklogSearchJob(EpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
+        public RecentBacklogSearchJob(IEpisodeService episodeService, EpisodeSearchJob episodeSearchJob,
                                             ConfigProvider configProvider)
         {
             _episodeService = episodeService;
diff --git a/NzbDrone.Core/Jobs/SeasonSearchJob.cs b/NzbDrone.Core/Jobs/SeasonSearchJob.cs
index a460a8947..1d838d391 100644
--- a/NzbDrone.Core/Jobs/SeasonSearchJob.cs
+++ b/NzbDrone.Core/Jobs/SeasonSearchJob.cs
@@ -13,12 +13,12 @@ namespace NzbDrone.Core.Jobs
     {
         private readonly SearchProvider _searchProvider;
         private readonly EpisodeSearchJob _episodeSearchJob;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public SeasonSearchJob(SearchProvider searchProvider, EpisodeSearchJob episodeSearchJob,
-                                EpisodeService episodeService)
+                                IEpisodeService episodeService)
         {
             _searchProvider = searchProvider;
             _episodeSearchJob = episodeSearchJob;
diff --git a/NzbDrone.Core/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
index 01ae91e56..79f3e520c 100644
--- a/NzbDrone.Core/Jobs/UpdateInfoJob.cs
+++ b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
@@ -14,13 +14,13 @@ namespace NzbDrone.Core.Jobs
     public class UpdateInfoJob : IJob
     {
         private readonly ISeriesService _seriesService;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly ReferenceDataProvider _referenceDataProvider;
         private readonly ConfigProvider _configProvider;
         private readonly ISeriesRepository _seriesRepository;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public UpdateInfoJob(ISeriesService seriesService, EpisodeService episodeService,
+        public UpdateInfoJob(ISeriesService seriesService, IEpisodeService episodeService,
                             ReferenceDataProvider referenceDataProvider, ConfigProvider configProvider, ISeriesRepository seriesRepository)
         {
             _seriesService = seriesService;
diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs
index 7141a992f..58f07d4c6 100644
--- a/NzbDrone.Core/Providers/DiskScanProvider.cs
+++ b/NzbDrone.Core/Providers/DiskScanProvider.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Providers
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private static readonly string[] mediaExtentions = new[] { ".mkv", ".avi", ".wmv", ".mp4", ".mpg", ".mpeg", ".xvid", ".flv", ".mov", ".rm", ".rmvb", ".divx", ".dvr-ms", ".ts", ".ogm", ".m4v", ".strm" };
         private readonly DiskProvider _diskProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly MediaFileProvider _mediaFileProvider;
         private readonly ISeriesService _seriesService;
         private readonly ExternalNotificationProvider _externalNotificationProvider;
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Providers
         private readonly MediaInfoProvider _mediaInfoProvider;
         private readonly ISeriesRepository _seriesRepository;
 
-        public DiskScanProvider(DiskProvider diskProvider, EpisodeService episodeService,
+        public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService,
                                 ISeriesService seriesService, MediaFileProvider mediaFileProvider,
                                 ExternalNotificationProvider externalNotificationProvider, DownloadProvider downloadProvider,
                                 SignalRProvider signalRProvider, ConfigProvider configProvider,
diff --git a/NzbDrone.Core/Providers/DownloadProvider.cs b/NzbDrone.Core/Providers/DownloadProvider.cs
index 0dfa6373d..73531c4b7 100644
--- a/NzbDrone.Core/Providers/DownloadProvider.cs
+++ b/NzbDrone.Core/Providers/DownloadProvider.cs
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Providers
     {
         private readonly SabProvider _sabProvider;
         private readonly HistoryProvider _historyProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly ExternalNotificationProvider _externalNotificationProvider;
         private readonly ConfigProvider _configProvider;
         private readonly BlackholeProvider _blackholeProvider;
@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Providers
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
         public DownloadProvider(SabProvider sabProvider, HistoryProvider historyProvider,
-            EpisodeService episodeService, ExternalNotificationProvider externalNotificationProvider,
+            IEpisodeService episodeService, ExternalNotificationProvider externalNotificationProvider,
             ConfigProvider configProvider, BlackholeProvider blackholeProvider,
             SignalRProvider signalRProvider, PneumaticProvider pneumaticProvider,
             NzbgetProvider nzbgetProvider)
diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs
index bdbcf254c..bfc7d5499 100644
--- a/NzbDrone.Core/Providers/MediaFileProvider.cs
+++ b/NzbDrone.Core/Providers/MediaFileProvider.cs
@@ -18,9 +18,9 @@ namespace NzbDrone.Core.Providers
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly ConfigProvider _configProvider;
         private readonly IDatabase _database;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
 
-        public MediaFileProvider(EpisodeService episodeService, ConfigProvider configProvider, IDatabase database)
+        public MediaFileProvider(IEpisodeService episodeService, ConfigProvider configProvider, IDatabase database)
         {
             _episodeService = episodeService;
             _configProvider = configProvider;
diff --git a/NzbDrone.Core/Providers/Metadata/MetadataBase.cs b/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
index 6892d93b8..ee643d78c 100644
--- a/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
+++ b/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
@@ -15,10 +15,10 @@ namespace NzbDrone.Core.Providers.Metadata
         protected readonly ConfigProvider _configProvider;
         protected readonly DiskProvider _diskProvider;
         protected readonly BannerProvider _bannerProvider;
-        protected readonly EpisodeService _episodeService;
+        protected readonly IEpisodeService _episodeService;
 
         protected MetadataBase(ConfigProvider configProvider, DiskProvider diskProvider,
-                                BannerProvider bannerProvider, EpisodeService episodeService)
+                                BannerProvider bannerProvider, IEpisodeService episodeService)
         {
             _configProvider = configProvider;
             _diskProvider = diskProvider;
diff --git a/NzbDrone.Core/Providers/Metadata/Xbmc.cs b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
index 14e51c56a..acf4c39af 100644
--- a/NzbDrone.Core/Providers/Metadata/Xbmc.cs
+++ b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Providers.Metadata
     public class Xbmc : MetadataBase
     {
         public Xbmc(ConfigProvider configProvider, DiskProvider diskProvider, 
-                    BannerProvider bannerProvider, EpisodeService episodeService)
+                    BannerProvider bannerProvider, IEpisodeService episodeService)
             : base(configProvider, diskProvider, bannerProvider, episodeService)
         {
         }
diff --git a/NzbDrone.Core/Providers/MisnamedProvider.cs b/NzbDrone.Core/Providers/MisnamedProvider.cs
index 8fc3d9576..ebce3e00b 100644
--- a/NzbDrone.Core/Providers/MisnamedProvider.cs
+++ b/NzbDrone.Core/Providers/MisnamedProvider.cs
@@ -14,11 +14,11 @@ namespace NzbDrone.Core.Providers
     public class MisnamedProvider
     {
         private readonly MediaFileProvider _mediaFileProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public MisnamedProvider(MediaFileProvider mediaFileProvider, EpisodeService episodeService)
+        public MisnamedProvider(MediaFileProvider mediaFileProvider, IEpisodeService episodeService)
         {
             _mediaFileProvider = mediaFileProvider;
             _episodeService = episodeService;
diff --git a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
index a7c124cad..fcce38200 100644
--- a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
+++ b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Providers.Search
         private readonly ISeriesRepository _seriesRepository;
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public DailyEpisodeSearch(ISeriesService seriesService, EpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
+        public DailyEpisodeSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
                              SceneMappingProvider sceneMappingProvider, AllowedDownloadSpecification allowedDownloadSpecification,
                              SearchHistoryProvider searchHistoryProvider, ISeriesRepository seriesRepository)
             : base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingProvider,
diff --git a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
index cfc984851..e17b20749 100644
--- a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
+++ b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Providers.Search
     {
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public EpisodeSearch(ISeriesService seriesService, EpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
+        public EpisodeSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
                              SceneMappingProvider sceneMappingProvider, AllowedDownloadSpecification allowedDownloadSpecification,
                              SearchHistoryProvider searchHistoryProvider, ISeriesRepository seriesRepository)
                         : base(seriesService,seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingProvider, 
diff --git a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
index 45451020f..f66c08392 100644
--- a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
+++ b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Providers.Search
     {
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public PartialSeasonSearch(ISeriesService seriesService, EpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
+        public PartialSeasonSearch(ISeriesService seriesService, IEpisodeService episodeService, DownloadProvider downloadProvider, IIndexerService indexerService,
                              SceneMappingProvider sceneMappingProvider, AllowedDownloadSpecification allowedDownloadSpecification,
                              SearchHistoryProvider searchHistoryProvider,ISeriesRepository seriesRepository)
                         : base(seriesService, seriesRepository, episodeService, downloadProvider, indexerService, sceneMappingProvider, 
diff --git a/NzbDrone.Core/Providers/Search/SearchBase.cs b/NzbDrone.Core/Providers/Search/SearchBase.cs
index 56f2db922..748e5ae19 100644
--- a/NzbDrone.Core/Providers/Search/SearchBase.cs
+++ b/NzbDrone.Core/Providers/Search/SearchBase.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Providers.Search
     {
         protected readonly ISeriesService _seriesService;
         private readonly ISeriesRepository _seriesRepository;
-        protected readonly EpisodeService _episodeService;
+        protected readonly IEpisodeService _episodeService;
         protected readonly DownloadProvider _downloadProvider;
         protected readonly IIndexerService _indexerService;
         protected readonly SceneMappingProvider _sceneMappingProvider;
@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Providers.Search
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        protected SearchBase(ISeriesService seriesService,ISeriesRepository seriesRepository, EpisodeService episodeService, DownloadProvider downloadProvider,
+        protected SearchBase(ISeriesService seriesService,ISeriesRepository seriesRepository, IEpisodeService episodeService, DownloadProvider downloadProvider,
                              IIndexerService indexerService, SceneMappingProvider sceneMappingProvider,
                              AllowedDownloadSpecification allowedDownloadSpecification,
                              SearchHistoryProvider searchHistoryProvider)
diff --git a/NzbDrone.Core/Providers/SearchHistoryProvider.cs b/NzbDrone.Core/Providers/SearchHistoryProvider.cs
index c6330eff5..5abb239bc 100644
--- a/NzbDrone.Core/Providers/SearchHistoryProvider.cs
+++ b/NzbDrone.Core/Providers/SearchHistoryProvider.cs
@@ -15,13 +15,13 @@ namespace NzbDrone.Core.Providers
         private readonly IDatabase _database;
         private readonly ISeriesService _seriesService;
         private readonly DownloadProvider _downloadProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly ISeriesRepository _seriesRepository;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
         public SearchHistoryProvider(IDatabase database, ISeriesService seriesService,
-                                        DownloadProvider downloadProvider, EpisodeService episodeService, ISeriesRepository seriesRepository)
+                                        DownloadProvider downloadProvider, IEpisodeService episodeService, ISeriesRepository seriesRepository)
         {
             _database = database;
             _seriesService = seriesService;
diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs
index 09fb6768c..23babebe9 100644
--- a/NzbDrone.Core/Providers/SearchProvider.cs
+++ b/NzbDrone.Core/Providers/SearchProvider.cs
@@ -17,13 +17,13 @@ namespace NzbDrone.Core.Providers
     public class SearchProvider
     {
         private readonly ISeriesService _seriesService;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly PartialSeasonSearch _partialSeasonSearch;
         private readonly ISeriesRepository _seriesRepository;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
-        public SearchProvider(ISeriesService seriesService, EpisodeService episodeService,
+        public SearchProvider(ISeriesService seriesService, IEpisodeService episodeService,
                               PartialSeasonSearch partialSeasonSearch,ISeriesRepository seriesRepository)
         {
             _seriesService = seriesService;
diff --git a/NzbDrone.Core/Providers/TvRageMappingProvider.cs b/NzbDrone.Core/Providers/TvRageMappingProvider.cs
index 6b8c76ca8..3d26773f7 100644
--- a/NzbDrone.Core/Providers/TvRageMappingProvider.cs
+++ b/NzbDrone.Core/Providers/TvRageMappingProvider.cs
@@ -13,12 +13,12 @@ namespace NzbDrone.Core.Providers
     {
         private readonly SceneMappingProvider _sceneMappingProvider;
         private readonly TvRageProvider _tvRageProvider;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
         public TvRageMappingProvider(SceneMappingProvider sceneMappingProvider,
-                                TvRageProvider tvRageProvider, EpisodeService episodeService)
+                                TvRageProvider tvRageProvider, IEpisodeService episodeService)
         {
             _sceneMappingProvider = sceneMappingProvider;
             _tvRageProvider = tvRageProvider;
diff --git a/NzbDrone.Core/Providers/XemProvider.cs b/NzbDrone.Core/Providers/XemProvider.cs
index cfcd8cf79..32159d831 100644
--- a/NzbDrone.Core/Providers/XemProvider.cs
+++ b/NzbDrone.Core/Providers/XemProvider.cs
@@ -11,13 +11,13 @@ namespace NzbDrone.Core.Providers
     public class XemProvider
     {
         private readonly ISeriesService _seriesService;
-        private readonly EpisodeService _episodeService;
+        private readonly IEpisodeService _episodeService;
         private readonly XemCommunicationProvider _xemCommunicationProvider;
         private readonly ISeriesRepository _seriesRepository;
 
         private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
-        public XemProvider(ISeriesService seriesService, EpisodeService episodeService,
+        public XemProvider(ISeriesService seriesService, IEpisodeService episodeService,
                             XemCommunicationProvider xemCommunicationProvider,ISeriesRepository seriesRepository)
         {
             _seriesService = seriesService;