diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
index a5aa5e017..f62f2a2f7 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         private void WithAutoIgnore(bool autoIgnore)
         {
 
-            Mocker.GetMock<ConfigService>()
+            Mocker.GetMock<IConfigService>()
                     .SetupGet(c => c.AutoIgnorePreviouslyDownloadedEpisodes).Returns(autoIgnore);
         }
 
diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
index 4fec613f0..bc358d64e 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -120,7 +120,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -148,7 +148,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -175,7 +175,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -202,7 +202,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -230,7 +230,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -264,7 +264,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -298,7 +298,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -332,7 +332,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -366,7 +366,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -400,7 +400,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -432,7 +432,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_should_append_proper_when_proper_and_append_quality_is_true()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -457,7 +457,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_should_not_append_proper_when_not_proper_and_append_quality_is_true()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -482,7 +482,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_should_not_append_proper_when_proper_and_append_quality_is_false()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -507,7 +507,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_should_order_multiple_episode_files_in_numerical_order()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -541,7 +541,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -568,7 +568,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
             //Setup
 
 
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -593,7 +593,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_UseSceneName_when_sceneName_isNull()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -624,7 +624,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void GetNewFilename_UseSceneName_when_sceneName_isNotNull()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(false);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -655,7 +655,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void should_only_have_one_episodeTitle_when_episode_titles_are_the_same()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -687,7 +687,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void should_have_two_episodeTitles_when_episode_titles_are_not_the_same()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -719,7 +719,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         public void should_have_two_episodeTitles_when_distinct_count_is_two()
         {
             //Setup
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -756,7 +756,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         [Test]
         public void should_use_airDate_if_series_isDaily()
         {
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(true);
@@ -785,7 +785,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         [Test]
         public void should_use_airDate_if_series_isDaily_no_episode_title()
         {
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(false);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);
@@ -814,7 +814,7 @@ namespace NzbDrone.Core.Test.ProviderTests.MediaFileProviderTests
         [Test]
         public void should_set_airdate_to_unknown_if_not_available()
         {
-            var fakeConfig = Mocker.GetMock<ConfigService>();
+            var fakeConfig = Mocker.GetMock<IConfigService>();
             fakeConfig.SetupGet(c => c.SortingIncludeSeriesName).Returns(true);
             fakeConfig.SetupGet(c => c.SortingIncludeEpisodeTitle).Returns(true);
             fakeConfig.SetupGet(c => c.SortingAppendQuality).Returns(false);