diff --git a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
index add4a367e..6be65a5e9 100644
--- a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
@@ -1,38 +1,30 @@
 using System.Collections.Generic;
-using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.History;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
-using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
-using NzbDrone.Test.Common;
 using NzbDrone.Core.Indexers;
 using System.Linq;
 
-namespace NzbDrone.Core.Test.Download
+namespace NzbDrone.Core.Test.Download.TrackedDownloads
 {
     [TestFixture]
     public class TrackedDownloadServiceFixture : CoreTest<TrackedDownloadService>
     {
-        private void GivenAHistoryWithADownload()
+        private void GivenDownloadHistory()
         {
             Mocker.GetMock<IHistoryService>()
                 .Setup(s => s.FindByDownloadId(It.Is<string>(sr => sr == "35238")))
                 .Returns(new List<History.History>(){
                  new History.History(){
                      DownloadId = "35238",
-                     SourceTitle = "Tv Series S01",
+                     SourceTitle = "TV Series S01",
                      SeriesId = 5,
                      EpisodeId = 4
                  }
@@ -42,7 +34,7 @@ private void GivenAHistoryWithADownload()
         [Test]
         public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_using_the_download_title()
         {
-            GivenAHistoryWithADownload();
+            GivenDownloadHistory();
 
             var remoteEpisode = new RemoteEpisode
             {
@@ -50,13 +42,13 @@ public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_
                 Episodes = new List<Episode> { new Episode { Id = 4 } },
                 ParsedEpisodeInfo = new ParsedEpisodeInfo()
                 {
-                    SeriesTitle = "tvseries",
+                    SeriesTitle = "TV Series",
                     SeasonNumber = 1
                 }
             };
 
             Mocker.GetMock<IParsingService>()
-               .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "tvseries"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
+               .Setup(s => s.Map(It.Is<ParsedEpisodeInfo>(i => i.SeasonNumber == 1 && i.SeriesTitle == "TV Series"), It.IsAny<int>(), It.IsAny<IEnumerable<int>>()))
                .Returns(remoteEpisode);
 
             var client = new DownloadClientDefinition()
@@ -73,10 +65,12 @@ public void should_track_downloads_using_the_source_title_if_it_cannot_be_found_
 
             var trackedDownload = Subject.TrackDownload(client, item);
 
+            trackedDownload.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Should().NotBeNull();
+            trackedDownload.RemoteEpisode.Series.Should().NotBeNull();
             trackedDownload.RemoteEpisode.Series.Id.Should().Be(5);
             trackedDownload.RemoteEpisode.Episodes.First().Id.Should().Be(4);
             trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeasonNumber.Should().Be(1);
-            trackedDownload.RemoteEpisode.ParsedEpisodeInfo.SeriesTitle.Should().Be("tvseries");
         }
     }
 }