diff --git a/NzbDrone.Core.Test/DiskScanJobTest.cs b/NzbDrone.Core.Test/DiskScanJobTest.cs
index 1522f70c2e..a11d119ee6 100644
--- a/NzbDrone.Core.Test/DiskScanJobTest.cs
+++ b/NzbDrone.Core.Test/DiskScanJobTest.cs
@@ -1,4 +1,4 @@
-using System;
+// ReSharper disable RedundantUsingDirective
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/NzbDrone.Core.Test/EpisodeProviderTest.cs b/NzbDrone.Core.Test/EpisodeProviderTest.cs
index 25e2c53cbc..9ae4b9512b 100644
Binary files a/NzbDrone.Core.Test/EpisodeProviderTest.cs and b/NzbDrone.Core.Test/EpisodeProviderTest.cs differ
diff --git a/NzbDrone.Core.Test/Fixtures.cs b/NzbDrone.Core.Test/Fixtures.cs
index e413f01f74..816b5f5ce6 100644
--- a/NzbDrone.Core.Test/Fixtures.cs
+++ b/NzbDrone.Core.Test/Fixtures.cs
@@ -1,3 +1,4 @@
+// ReSharper disable RedundantUsingDirective
 using System;
 using System.IO;
 using MbUnit.Framework;
diff --git a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqer.cs b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqer.cs
index 9af4fd78e2..27b2eee781 100644
--- a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqer.cs
+++ b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqer.cs
@@ -1,3 +1,4 @@
+// ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
index dacb0e36da..4c1a0bc1aa 100644
--- a/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
+++ b/NzbDrone.Core.Test/Framework/AutoMoq/AutoMoqerTest.cs
@@ -1,7 +1,8 @@
-using System;
+// ReSharper disable RedundantUsingDirective
 using AutoMoq;
 using MbUnit.Framework;
 using Moq;
+using System;
 
 namespace NzbDrone.Core.Test
 {
diff --git a/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingBuilderStrategy.cs b/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
index 0f1877b3d3..af393fbeef 100644
--- a/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
+++ b/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingBuilderStrategy.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
diff --git a/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingContainerExtension.cs b/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingContainerExtension.cs
index 935337d538..d9979df323 100644
--- a/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingContainerExtension.cs
+++ b/NzbDrone.Core.Test/Framework/AutoMoq/Unity/AutoMockingContainerExtension.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using Microsoft.Practices.Unity;
 using Microsoft.Practices.Unity.ObjectBuilder;
diff --git a/NzbDrone.Core.Test/Framework/ExceptionVerification.cs b/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
index 6de716867e..9dbb4d5b0e 100644
--- a/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
+++ b/NzbDrone.Core.Test/Framework/ExceptionVerification.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using NLog;
diff --git a/NzbDrone.Core.Test/Framework/MockLib.cs b/NzbDrone.Core.Test/Framework/MockLib.cs
index dc58de9c21..774a4448ee 100644
--- a/NzbDrone.Core.Test/Framework/MockLib.cs
+++ b/NzbDrone.Core.Test/Framework/MockLib.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/NzbDrone.Core.Test/Framework/TestBase.cs b/NzbDrone.Core.Test/Framework/TestBase.cs
index f17e9bf26c..74bafacf56 100644
--- a/NzbDrone.Core.Test/Framework/TestBase.cs
+++ b/NzbDrone.Core.Test/Framework/TestBase.cs
@@ -3,6 +3,7 @@
 namespace NzbDrone.Core.Test.Framework
 {
     public class TestBase
+    // ReSharper disable InconsistentNaming
     {
 
         [SetUp]
diff --git a/NzbDrone.Core.Test/HistoryProviderTest.cs b/NzbDrone.Core.Test/HistoryProviderTest.cs
index edbfb2d941..c689a41ff5 100644
--- a/NzbDrone.Core.Test/HistoryProviderTest.cs
+++ b/NzbDrone.Core.Test/HistoryProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using AutoMoq;
@@ -26,7 +27,6 @@ public void AllItems()
                                   AirDate = DateTime.Today.AddDays(-1),
                                   EpisodeId = 1234,
                                   EpisodeNumber = 5,
-                                  Language = "English",
                                   Overview = "This is an Overview",
                                   SeasonNumber = 1,
                                   SeasonId = 4321,
@@ -107,7 +107,6 @@ public void Exists_True()
                                   AirDate = DateTime.Today.AddDays(-1),
                                   EpisodeId = 1234,
                                   EpisodeNumber = 5,
-                                  Language = "English",
                                   Overview = "This is an Overview",
                                   SeasonNumber = 1,
                                   SeasonId = 4321,
@@ -137,13 +136,12 @@ public void Exists_False()
             //Todo: This test fails... Moq Setup doesn't return the expected value
 
             //Setup
-           var season = new Season { SeasonId = 4321, SeasonNumber = 1, SeriesId = 5656, Monitored = true };
+            var season = new Season { SeasonId = 4321, SeasonNumber = 1, SeriesId = 5656, Monitored = true };
             var episode = new Episode
                               {
                                   AirDate = DateTime.Today.AddDays(-1),
                                   EpisodeId = 1234,
                                   EpisodeNumber = 5,
-                                  Language = "English",
                                   Overview = "This is an Overview",
                                   SeasonNumber = 1,
                                   SeasonId = 4321,
diff --git a/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
index b073cd4c35..02b9f7f3ea 100644
--- a/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
+++ b/NzbDrone.Core.Test/ImportNewSeriesJobTest.cs
@@ -1,4 +1,4 @@
-using System;
+// ReSharper disable RedundantUsingDirective
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
@@ -11,6 +11,7 @@
 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 f43a5b2b8e..dccb384a56 100644
--- a/NzbDrone.Core.Test/IndexerProviderTest.cs
+++ b/NzbDrone.Core.Test/IndexerProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
diff --git a/NzbDrone.Core.Test/InventoryProviderTest.cs b/NzbDrone.Core.Test/InventoryProviderTest.cs
index fdad3973b5..bbf0113c65 100644
--- a/NzbDrone.Core.Test/InventoryProviderTest.cs
+++ b/NzbDrone.Core.Test/InventoryProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
diff --git a/NzbDrone.Core.Test/JobProviderTest.cs b/NzbDrone.Core.Test/JobProviderTest.cs
index b160a0c3c9..f1af906bcc 100644
--- a/NzbDrone.Core.Test/JobProviderTest.cs
+++ b/NzbDrone.Core.Test/JobProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using AutoMoq;
diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs
index 6b8935116f..f308b886b6 100644
--- a/NzbDrone.Core.Test/MediaFileProviderTests.cs
+++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Linq;
diff --git a/NzbDrone.Core.Test/ParserTest.cs b/NzbDrone.Core.Test/ParserTest.cs
index ad584cd511..9ec82dc28c 100644
--- a/NzbDrone.Core.Test/ParserTest.cs
+++ b/NzbDrone.Core.Test/ParserTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using MbUnit.Framework;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/QualityProfileTest.cs b/NzbDrone.Core.Test/QualityProfileTest.cs
index 5a58933b25..da1faeba3d 100644
--- a/NzbDrone.Core.Test/QualityProfileTest.cs
+++ b/NzbDrone.Core.Test/QualityProfileTest.cs
@@ -1,3 +1,4 @@
+// ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NzbDrone.Core.Test/RepoTest.cs b/NzbDrone.Core.Test/RepoTest.cs
index 4cc73e07b2..6162383099 100644
--- a/NzbDrone.Core.Test/RepoTest.cs
+++ b/NzbDrone.Core.Test/RepoTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Linq;
 using FizzWare.NBuilder;
 using MbUnit.Framework;
diff --git a/NzbDrone.Core.Test/RootDirProviderTest.cs b/NzbDrone.Core.Test/RootDirProviderTest.cs
index 9c0e50228d..4ebfcff44d 100644
--- a/NzbDrone.Core.Test/RootDirProviderTest.cs
+++ b/NzbDrone.Core.Test/RootDirProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.Linq;
 using AutoMoq;
 using MbUnit.Framework;
diff --git a/NzbDrone.Core.Test/SabProviderTest.cs b/NzbDrone.Core.Test/SabProviderTest.cs
index 1f6c47cb9c..d48df6fe0d 100644
--- a/NzbDrone.Core.Test/SabProviderTest.cs
+++ b/NzbDrone.Core.Test/SabProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using System.IO;
 using System.Linq;
 using AutoMoq;
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index bcf0579db9..ef891cbce1 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 812fa8a9a2..992f991be9 100644
--- a/NzbDrone.Core.Test/TvDbProviderTest.cs
+++ b/NzbDrone.Core.Test/TvDbProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+// ReSharper disable RedundantUsingDirective
+using System;
 using MbUnit.Framework;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Test.Framework;