still trying this merge

.gitignore

@@ -26,7 +26,7 @@ Thumbs.db
 obj/
 [Rr]elease*/
 _ReSharper*/
-[Tt]est[Rr]esult
+[Tt]est[Rr]esult[s]
 
 #NZBDrone specific
 nzbdrone.db

NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -86,15 +86,13 @@
     <Content Include="Libs\FizzWare.NBuilder.dll" />
     <Content Include="Libs\Moq.dll" />
     <Content Include="Libs\Moq.xml" />
-    <Content Include="Files\Queue.xml">
     <Content Include="Files\Queue.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Files\QueueEmpty.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-
+    <Content Include="Files\QueueError.xml">
-    <Content Include="Files\QueueError.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

NzbDrone.Core.Test/TvDbControllerTest.cs

@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Test
         [Row("The Simpsons")]
         [Row("Family Guy")]
         [Row("South Park")]
+        [Ignore("Have to find a way to mock app path for tests.")]
         public void TestSearch(string title)
         {
             var tvCont =new TvDbController();