diff --git a/NzbDrone.Core.Test/Libs/FizzWare.NBuilder.dll b/NzbDrone.Core.Test/Libs/FizzWare.NBuilder.dll
new file mode 100644
index 000000000..1892a17a5
Binary files /dev/null and b/NzbDrone.Core.Test/Libs/FizzWare.NBuilder.dll differ
diff --git a/NzbDrone.Core.Test/Moq/Moq.dll b/NzbDrone.Core.Test/Libs/Moq.dll
similarity index 100%
rename from NzbDrone.Core.Test/Moq/Moq.dll
rename to NzbDrone.Core.Test/Libs/Moq.dll
diff --git a/NzbDrone.Core.Test/Moq/Moq.xml b/NzbDrone.Core.Test/Libs/Moq.xml
similarity index 100%
rename from NzbDrone.Core.Test/Moq/Moq.xml
rename to NzbDrone.Core.Test/Libs/Moq.xml
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index d3c505380..ed47967a3 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FizzWare.NBuilder, Version=2.1.9.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\FizzWare.NBuilder.dll</HintPath>
+    </Reference>
     <Reference Include="Gallio, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL" />
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -77,8 +81,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Moq\Moq.dll" />
-    <Content Include="Moq\Moq.xml" />
+    <Content Include="Libs\FizzWare.NBuilder.dll" />
+    <Content Include="Libs\Moq.dll" />
+    <Content Include="Libs\Moq.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NzbDrone.Core.Test/SeriesTest.cs b/NzbDrone.Core.Test/SeriesTest.cs
index f3c429241..246f6633e 100644
--- a/NzbDrone.Core.Test/SeriesTest.cs
+++ b/NzbDrone.Core.Test/SeriesTest.cs
@@ -1,11 +1,18 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using FizzWare.NBuilder;
 using Gallio.Framework;
 using MbUnit.Framework;
 using MbUnit.Framework.ContractVerifiers;
 using Moq;
+using Ninject;
+using Ninject.Moq;
 using NzbDrone.Core.Controllers;
+using NzbDrone.Core.Repository;
+using SubSonic.Repository;
+using TvdbLib.Data;
 
 // ReSharper disable InconsistentNaming
 namespace NzbDrone.Core.Test
@@ -17,8 +24,32 @@ namespace NzbDrone.Core.Test
         [Description("This test will confirm that a folder will be skipped if it has been resolved to a series already assigned to another folder")]
         public void skip_same_series_diffrent_folder()
         {
+            var tvDbId = 1234;
+
             //Arrange
-            var seriesProvider = new SeriesController(new Mock<Ilog>(), new Mock<IDiskController>(), new Mock<IConfigController>(), new )
+            var moqData = new Mock<IRepository>();
+            var moqTvdb = new Mock<ITvDbController>();
+
+            //setup db to return a fake series
+            Series fakeSeries = Builder<Series>.CreateNew()
+                .With(f => f.TvdbId = tvDbId.ToString())
+                .Build();
+
+            moqData.Setup(f => f.Single<Series>(tvDbId)).
+                Returns(fakeSeries);
+
+            //setup tvdb to return the same show,
+            IList<TvdbSearchResult> fakeSearchResult = Builder<TvdbSearchResult>.CreateListOfSize(4).WhereTheFirst(1).Has(f => f.Id = tvDbId).Build();
+            
+            moqTvdb.Setup(f => f.SearchSeries(It.IsAny<string>())).
+                Returns(fakeSearchResult);
+
+            var kernel = new MockingKernel();
+            kernel.Bind<IRepository>().ToConstant(moqData.Object);
+            kernel.Bind<ITvDbController>().ToConstant(moqTvdb.Object);
+
+            var seriesController = kernel.Get<ISeriesController>();
+            seriesController.a
         }
     }
 }
diff --git a/NzbDrone.Core/Controllers/ITvDbController.cs b/NzbDrone.Core/Controllers/ITvDbController.cs
index 922f47064..95d8bb03e 100644
--- a/NzbDrone.Core/Controllers/ITvDbController.cs
+++ b/NzbDrone.Core/Controllers/ITvDbController.cs
@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Controllers
 {
     public interface ITvDbController
     {
-        List<TvdbSearchResult> SearchSeries(string name);
+        IList<TvdbSearchResult> SearchSeries(string name);
         TvdbSeries GetSeries(int id, TvdbLanguage language);
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Controllers/SeriesController.cs b/NzbDrone.Core/Controllers/SeriesController.cs
index 3eaa41d10..d1c1d6064 100644
--- a/NzbDrone.Core/Controllers/SeriesController.cs
+++ b/NzbDrone.Core/Controllers/SeriesController.cs
@@ -58,7 +58,7 @@ namespace NzbDrone.Core.Controllers
 
         private void AddShow(string path)
         {
-            List<TvdbSearchResult> searchResults = _tvDb.SearchSeries(new DirectoryInfo(path).Name);
+            var searchResults = _tvDb.SearchSeries(new DirectoryInfo(path).Name);
             if (searchResults.Count != 0)
             {
                 AddShow(path, _tvDb.GetSeries(searchResults[0].Id, searchResults[0].Language));
diff --git a/NzbDrone.Core/Controllers/TvDbController.cs b/NzbDrone.Core/Controllers/TvDbController.cs
index 50f786127..ea33cf228 100644
--- a/NzbDrone.Core/Controllers/TvDbController.cs
+++ b/NzbDrone.Core/Controllers/TvDbController.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Controllers
 
         #region ITvDbController Members
 
-        public List<TvdbSearchResult> SearchSeries(string name)
+        public IList<TvdbSearchResult> SearchSeries(string name)
         {
             return _handler.SearchSeries(name);
         }