diff --git a/NzbDrone.Core.Test/EpisodeStatusTest.cs b/NzbDrone.Core.Test/EpisodeStatusTest.cs
index 62ae0d2b1..ec7996299 100644
--- a/NzbDrone.Core.Test/EpisodeStatusTest.cs
+++ b/NzbDrone.Core.Test/EpisodeStatusTest.cs
@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Test
             .With(e => e.AirDate = DateTime.Now.AddDays(offsetDays))
                 .With(e => e.Ignored = ignored)
                 .With(e => e.EpisodeFileId = 0)
-                .With(e => e.GrabDate = DateTime.Now.AddDays(-1))
+                .With(e => e.GrabDate = DateTime.Now.AddHours(22))
                 .Build();
 
             if (hasEpisodes)
diff --git a/NzbDrone.Core/Providers/NotificationProvider.cs b/NzbDrone.Core/Providers/NotificationProvider.cs
index 88f933d64..aebd6b114 100644
--- a/NzbDrone.Core/Providers/NotificationProvider.cs
+++ b/NzbDrone.Core/Providers/NotificationProvider.cs
@@ -7,12 +7,12 @@ namespace NzbDrone.Core.Providers
 {
     public class NotificationProvider
     {
-        private readonly Dictionary<Guid, BasicNotification> _basicNotifications =
+        private static readonly Dictionary<Guid, BasicNotification> _basicNotifications =
             new Dictionary<Guid, BasicNotification>();
 
-        private readonly Object _lock = new object();
+        private static readonly Object _lock = new object();
 
-        private readonly Dictionary<Guid, ProgressNotification> _progressNotification =
+        private static readonly Dictionary<Guid, ProgressNotification> _progressNotification =
             new Dictionary<Guid, ProgressNotification>();
 
         public virtual List<BasicNotification> BasicNotifications