diff --git a/Sources/Console/ConsoleProgram.cs b/Sources/Console/ConsoleProgram.cs
index ebab61e..731cb4a 100644
--- a/Sources/Console/ConsoleProgram.cs
+++ b/Sources/Console/ConsoleProgram.cs
@@ -5,37 +5,38 @@ namespace Console
 {
     public class ConsoleProgram
     {
-        public IDataManager DataManager;
+        public IDataManager DataManager { get; set; }
 
-        public Manager Manager;
+        public Manager Manager { get; set; }
 
-        public Playlist p1;
+        public Playlist P1 { get; set; }
 
-        public Title? current;
+        public Title? Current { get; set; }
 
         public ConsoleProgram()
         {
             DataManager = new StubManager();
             Manager = new(DataManager);
-            p1 = Manager.Playlists.First();
-            current = p1.GetCurrentTitle();
+            P1 = Manager.Playlists.First();
+            Current = P1.GetCurrentTitle();
         }
 
+        // To avoid No entry point Found Exception
         public static void Main()
         {
-
+            throw new NotSupportedException();
         }
 
         public void FonctionalTests()
         {
             Manager.AddPlaylist(new Playlist("MegaTeuf", "DescPlaylist", "ImagePlaylist"));
 
-            System.Console.WriteLine(current?.Name);
+            System.Console.WriteLine(Current?.Name);
 
             Next(2);
 
-            p1.AddTitle(new CustomTitle("Nouveau", "img.png", "infos", "path.mp3"));
-            p1.Shuffle = true;
+            P1.AddTitle(new CustomTitle("Nouveau", "img.png", "infos", "path.mp3"));
+            P1.Shuffle = true;
 
             Separator();
 
@@ -76,9 +77,9 @@ namespace Console
         {
             for (int i = 0; i < n; i++)
             {
-                p1.NextTitle();
-                current = p1.GetCurrentTitle();
-                System.Console.WriteLine(current?.Name);
+                P1.NextTitle();
+                Current = P1.GetCurrentTitle();
+                System.Console.WriteLine(Current?.Name);
             }
         }
 
@@ -86,13 +87,13 @@ namespace Console
         {
             for (int i = 0; i < n; i++)
             {
-                p1.PreviousTitle();
-                current = p1.GetCurrentTitle();
-                System.Console.WriteLine(current?.Name);
+                P1.PreviousTitle();
+                Current = P1.GetCurrentTitle();
+                System.Console.WriteLine(Current?.Name);
             }
         }
 
-        public void DisplaySerialization<T>(IEnumerable<T> objects)
+        public static void DisplaySerialization<T>(IEnumerable<T> objects)
         {
             foreach (var obj in objects)
             {
diff --git a/Sources/TestUnitaires/TU_Program.cs b/Sources/TestUnitaires/TU_Program.cs
index 434a525..9dedc2d 100644
--- a/Sources/TestUnitaires/TU_Program.cs
+++ b/Sources/TestUnitaires/TU_Program.cs
@@ -11,7 +11,8 @@
             cp.Next(1);
             cp.Previous(1);
             Console.ConsoleProgram.Separator();
-            cp.DisplaySerialization(a);
+            Console.ConsoleProgram.DisplaySerialization(a);
+            Assert.NotNull(cp.Current);
         }
     }
 }