diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs
index 2099804..8848141 100644
--- a/Sources/Model/Manager.cs
+++ b/Sources/Model/Manager.cs
@@ -171,7 +171,7 @@ namespace Model.Stub
         /// </summary>
         public void PreviousTitle()
         {
-            if (CurrentPlaying == null) return;
+            if (CurrentPlaylist == null) return;
             currentPlaying = currentPlaylist.PreviousTitle();
         }
 
diff --git a/Sources/TestUnitaires/TU_Manager.cs b/Sources/TestUnitaires/TU_Manager.cs
index ed3d74f..6a6fa8d 100644
--- a/Sources/TestUnitaires/TU_Manager.cs
+++ b/Sources/TestUnitaires/TU_Manager.cs
@@ -20,11 +20,6 @@ namespace TestUnitaires
             Artist artist = new(test);
             Manager m = new(new LinqXmlSerialization(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data")));
             InfoTitle info = new(test, "url.test", "infos", "desc", Genre.POP, 345);
-            /*Assert.NotEmpty(m.Albums);
-            Assert.NotEmpty(m.Artists);
-            Assert.NotEmpty(m.InfoTitles);
-            Assert.NotEmpty(m.Playlists);
-            Assert.NotEmpty(m.CustomTitles);*/
             m.AddCustomTitle(t);
             m.AddPlaylist(p);
             m.AddAlbum(album);
@@ -42,7 +37,7 @@ namespace TestUnitaires
             Assert.DoesNotContain(t, m.CustomTitles);
             Assert.DoesNotContain(p, m.Playlists);
             Assert.DoesNotContain(album, m.Albums);
-            Assert.DoesNotContain(info,m.InfoTitles);
+            Assert.DoesNotContain(info, m.InfoTitles);
             m.AddCustomTitle(t);
             m.AddPlaylist(p);
             m.AddAlbum(album);
@@ -57,6 +52,65 @@ namespace TestUnitaires
             Assert.Equal(m.GetPlaylistByName(test), p);
             Assert.Equal(m.GetInfoTitleByName(test), info);
             Assert.Equal(m.GetArtistByName(test), artist);
+
+            var ca = m.CurrentAlbum;
+            var ci = m.CurrentInfoTitle;
+            var cc = m.CurrentPlaying;
+            var cp = m.CurrentPlaylist;
+
+            Assert.Equal(m.CurrentAlbum, ca);
+            Assert.Equal(m.CurrentInfoTitle, ci);
+            Assert.Equal(m.CurrentPlaying, cc);
+            Assert.Equal(m.CurrentPlaylist, cp);
+
+            m.CurrentPlaylist = p;
+            m.CurrentInfoTitle = info;
+            m.CurrentPlaying = t;
+            m.CurrentAlbum = album;
+
+            Assert.Equal(p, m.CurrentPlaylist);
+            Assert.Equal(info, m.CurrentInfoTitle);
+            Assert.Equal(t, m.CurrentPlaying);
+            Assert.Equal(album, m.CurrentAlbum);
+
+            m.NextTitle();
+            Assert.Null(m.CurrentPlaying);
+            m.PreviousTitle();
+            Assert.Null(m.CurrentPlaying);
+
+            m.CurrentPlaylist = null;
+            m.NextTitle();
+            Assert.Null(m.CurrentPlaying);
+            m.PreviousTitle();
+            Assert.Null(m.CurrentPlaying);
+
+            var cct = m.CurrentTitle();
+            Assert.Null(cct);
+
+            m.Loop();
+
+            m.Shuffle();
+
+            p.AddTitle(t);
+            m.CurrentPlaylist = p;
+            m.CurrentPlaying = t;
+            cct = m.CurrentTitle();
+            Assert.NotNull(cct);
+
+            var loop = m.CurrentPlaylist.LoopTitle;
+            m.Loop();
+            Assert.NotEqual(loop, m.CurrentPlaylist.LoopTitle);
+
+            var shuffle = m.CurrentPlaylist.Shuffle;
+            m.Shuffle();
+            Assert.NotEqual(shuffle, m.CurrentPlaylist.Shuffle);
+
+            var custom = m.GetCustomTitleByPath(t.Path);
+            Assert.Equal(t, custom);
+
+            p.AddTitle(t);
+            m.RemoveCustomTitleFromPlaylists(t);
+            Assert.DoesNotContain(t, p.Titles);
         }
     }