diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs
index 5d90df06a..c6f485bf6 100644
--- a/NzbDrone.Core.Test/CentralDispatchFixture.cs
+++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs
@@ -1,5 +1,4 @@
-// ReSharper disable InconsistentNaming
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Autofac;
@@ -17,6 +16,7 @@ namespace NzbDrone.Core.Test
 {
     [TestFixture]
     [ExclusivelyUses("REAL_LOG_FILE")]
+    [Serial]
     class CentralDispatchFixture : CoreTest
     {
         readonly IList<string> indexers = typeof(CentralDispatch).Assembly.GetTypes().Where(t => t.IsSubclassOf(typeof(IndexerBase))).Select(c => c.ToString()).ToList();
diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
index d0130a30f..5de2c1b4a 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using FizzWare.NBuilder;
 using FluentAssertions;
+using NCrunch.Framework;
 using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
@@ -17,7 +18,7 @@
 namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
 {
     [TestFixture]
-    // ReSharper disable InconsistentNaming
+    [ExclusivelyUses("JOB_PROVIDER")]
     public class JobProviderFixture : CoreTest
     {
 
diff --git a/NzbDrone.Core/Fluent.cs b/NzbDrone.Core/Fluent.cs
index baa0469f3..07ada240b 100644
--- a/NzbDrone.Core/Fluent.cs
+++ b/NzbDrone.Core/Fluent.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace NzbDrone.Core
diff --git a/NzbDrone.Test.Common/TestBase.cs b/NzbDrone.Test.Common/TestBase.cs
index 2e8fcb09d..ff9b64bca 100644
--- a/NzbDrone.Test.Common/TestBase.cs
+++ b/NzbDrone.Test.Common/TestBase.cs
@@ -55,12 +55,6 @@ public void TestBaseSetup()
             ReportingService.RestProvider = MockedRestProvider.Object;
             ReportingService.SetupExceptronDriver();
 
-
-            if (Directory.Exists(TempFolder))
-            {
-                Directory.Delete(TempFolder, true);
-            }
-
             Directory.CreateDirectory(TempFolder);
         }
 
diff --git a/NzbDrone.Web/Web.config b/NzbDrone.Web/Web.config
index 8d486ad60..8c66df141 100644
--- a/NzbDrone.Web/Web.config
+++ b/NzbDrone.Web/Web.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <section name="cassette" type="Cassette.CassetteConfigurationSection, Cassette, Version=2.0.0.17974, Culture=neutral, PublicKeyToken=null" />
   </configSections>
   <startup useLegacyV2RuntimeActivationPolicy="true">
@@ -31,15 +30,7 @@
       </namespaces>
     </pages>
     <customErrors mode="Off" />
-    <httpHandlers>
-      <!--<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>-->
-      <add path="cassette.axd" verb="*" type="Cassette.Aspnet.CassetteHttpHandler, Cassette.Aspnet" />
-    </httpHandlers>
-    <httpModules>
-      <add name="CassetteHttpModule" type="Cassette.Aspnet.CassetteHttpModule, Cassette.Aspnet" />
-    </httpModules>
   </system.web>
-  <system.web.extensions />
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true">
       <add name="CassetteHttpModule" type="Cassette.Aspnet.CassetteHttpModule, Cassette.Aspnet" />
@@ -74,10 +65,6 @@
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.8.0" newVersion="4.0.8.0" />
@@ -94,11 +81,4 @@
       <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </DbProviderFactories>
   </system.data>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
-      <parameters>
-        <parameter value="System.Data.SqlServerCe.4.0" />
-      </parameters>
-    </defaultConnectionFactory>
-  </entityFramework>
 </configuration>
\ No newline at end of file