diff --git a/Selector.Tests/Watcher/PlayerWatcher.cs b/Selector.Tests/Watcher/PlayerWatcher.cs
index f3b4609..c93ebf6 100644
--- a/Selector.Tests/Watcher/PlayerWatcher.cs
+++ b/Selector.Tests/Watcher/PlayerWatcher.cs
@@ -54,9 +54,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("nochange", "album1", "artist1"), isPlaying: true, context: "context1"),
                 },
                 // to raise
-                new List<string>(){ },
+                new List<string>(){ "ItemChange", "ContextChange", "PlayingChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "AlbumChange", "ArtistChange", "ContextChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // TRACK CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -64,9 +64,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("trackchange2", "album1", "artist1"))
                 },
                 // to raise
-                new List<string>(){ "ItemChange" },
+                new List<string>(){ "ContextChange", "PlayingChange", "ItemChange" },
                 // to not raise
-                new List<string>(){ "AlbumChange", "ArtistChange", "ContextChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // ALBUM CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -74,9 +74,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("albumchange", "album2", "artist1"))
                 },
                 // to raise
-                new List<string>(){ "AlbumChange" },
+                new List<string>(){ "ContextChange", "PlayingChange", "ItemChange", "AlbumChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "ArtistChange", "ContextChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // ARTIST CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -84,9 +84,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("artistchange", "album1", "artist2"))
                 },
                 // to raise
-                new List<string>(){ "ArtistChange" },
+                new List<string>(){ "ContextChange", "PlayingChange", "ItemChange", "ArtistChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "AlbumChange", "ContextChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "DeviceChange", "VolumeChange" }
             },
             // CONTEXT CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -94,9 +94,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("contextchange", "album1", "artist1"), context: "context2")
                 },
                 // to raise
-                new List<string>(){ "ContextChange" },
+                new List<string>(){ "PlayingChange", "ItemChange", "ContextChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "AlbumChange", "ArtistChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // PLAYING CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -104,9 +104,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("playingchange1", "album1", "artist1"), isPlaying: false, context: "context1")
                 },
                 // to raise
-                new List<string>(){ "PlayingChange" },
+                new List<string>(){ "ContextChange", "ItemChange", "PlayingChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "AlbumChange", "ArtistChange", "ContextChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // PLAYING CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -114,9 +114,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("playingchange2", "album1", "artist1"), isPlaying: true, context: "context1")
                 },
                 // to raise
-                new List<string>(){ "PlayingChange" },
+                new List<string>(){ "ContextChange", "ItemChange", "PlayingChange" },
                 // to not raise
-                new List<string>(){ "ItemChange", "AlbumChange", "ArtistChange", "ContextChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // CONTENT CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -124,9 +124,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullEpisode("contentchange1", "show1", "pub1"), isPlaying: true, context: "context2")
                 },
                 // to raise
-                new List<string>(){ "ContentChange", "ContextChange", "ItemChange" },
+                new List<string>(){ "PlayingChange", "ContentChange", "ContextChange", "ItemChange" },
                 // to not raise
-                new List<string>(){ "AlbumChange", "ArtistChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // CONTENT CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -134,9 +134,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("contentchange1", "album1", "artist1"), isPlaying: true, context: "context1")
                 },
                 // to raise
-                new List<string>(){ "ContentChange", "ContextChange", "ItemChange" },
+                new List<string>(){ "PlayingChange", "ContentChange", "ContextChange", "ItemChange" },
                 // to not raise
-                new List<string>(){ "AlbumChange", "ArtistChange", "PlayingChange", "DeviceChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "DeviceChange", "VolumeChange" }
             },
             // DEVICE CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -144,9 +144,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("devicechange", "album1", "artist1"), device: Helper.Device("dev2"))
                 },
                 // to raise
-                new List<string>(){ "DeviceChange" },
+                new List<string>(){ "ContextChange", "PlayingChange", "ItemChange", "DeviceChange" },
                 // to not raise
-                new List<string>(){ "AlbumChange", "ArtistChange", "PlayingChange", "ContentChange", "ContextChange", "ItemChange", "VolumeChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "ContentChange", "VolumeChange" }
             },
             // VOLUME CHANGE
             new object[] { new List<CurrentlyPlayingContext>(){
@@ -154,9 +154,9 @@ namespace Selector.Tests
                     Helper.CurrentPlayback(Helper.FullTrack("volumechange", "album1", "artist1"), device: Helper.Device("dev1", volume: 60))
                 },
                 // to raise
-                new List<string>(){ "VolumeChange" },
+                new List<string>(){ "ContextChange", "PlayingChange", "ItemChange", "VolumeChange" },
                 // to not raise
-                new List<string>(){ "AlbumChange", "ArtistChange", "PlayingChange", "ContentChange", "ContextChange", "ItemChange", "DeviceChange" }
+                new List<string>(){ "AlbumChange", "ArtistChange", "ContentChange", "DeviceChange" }
             },
             // // STARTED PLAYBACK
             // new object[] { new List<CurrentlyPlayingContext>(){