diff --git a/DiscImageChef.Tests.Devices/ATA/Ata28.cs b/DiscImageChef.Tests.Devices/ATA/Ata28.cs
index 3ff6e506..1dee35dc 100644
--- a/DiscImageChef.Tests.Devices/ATA/Ata28.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Ata28.cs
@@ -118,7 +118,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadBuffer(string devPath, Device dev)
+        static void ReadBuffer(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -196,7 +196,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadBufferDma(string devPath, Device dev)
+        static void ReadBufferDma(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -274,7 +274,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadDma(string devPath, Device dev, bool retries)
+        static void ReadDma(string devPath, Device dev, bool retries)
         {
             uint lba = 0;
             byte count = 1;
@@ -417,7 +417,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadLong(string devPath, Device dev, bool retries)
+        static void ReadLong(string devPath, Device dev, bool retries)
         {
             uint lba = 0;
             uint blockSize = 1;
@@ -551,7 +551,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadMultiple(string devPath, Device dev)
+        static void ReadMultiple(string devPath, Device dev)
         {
             uint lba = 0;
             byte count = 1;
@@ -694,7 +694,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadNativeMaxAddress(string devPath, Device dev)
+        static void ReadNativeMaxAddress(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -747,7 +747,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadSectors(string devPath, Device dev, bool retries)
+        static void ReadSectors(string devPath, Device dev, bool retries)
         {
             uint lba = 0;
             byte count = 1;
@@ -890,7 +890,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void Seek(string devPath, Device dev)
+        static void Seek(string devPath, Device dev)
         {
             uint lba = 0;
             string strDev;
diff --git a/DiscImageChef.Tests.Devices/ATA/Ata48.cs b/DiscImageChef.Tests.Devices/ATA/Ata48.cs
index dc9adb65..3267fbf8 100644
--- a/DiscImageChef.Tests.Devices/ATA/Ata48.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Ata48.cs
@@ -102,7 +102,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void GetNativeMaxAddressExt(string devPath, Device dev)
+        static void GetNativeMaxAddressExt(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -155,7 +155,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadDmaExt(string devPath, Device dev)
+        static void ReadDmaExt(string devPath, Device dev)
         {
             ulong lba = 0;
             ushort count = 1;
@@ -298,7 +298,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadLogExt(string devPath, Device dev)
+        static void ReadLogExt(string devPath, Device dev)
         {
             byte address = 0;
             ushort page = 0;
@@ -447,7 +447,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadLogDmaExt(string devPath, Device dev)
+        static void ReadLogDmaExt(string devPath, Device dev)
         {
             byte address = 0;
             ushort page = 0;
@@ -596,7 +596,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadMultipleExt(string devPath, Device dev)
+        static void ReadMultipleExt(string devPath, Device dev)
         {
             ulong lba = 0;
             ushort count = 1;
@@ -739,7 +739,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadNativeMaxAddressExt(string devPath, Device dev)
+        static void ReadNativeMaxAddressExt(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -792,7 +792,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadSectorsExt(string devPath, Device dev)
+        static void ReadSectorsExt(string devPath, Device dev)
         {
             ulong lba = 0;
             ushort count = 1;
diff --git a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
index f262ec03..0dd9de2b 100644
--- a/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
+++ b/DiscImageChef.Tests.Devices/ATA/AtaCHS.cs
@@ -110,7 +110,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void Identify(string devPath, Device dev)
+        static void Identify(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -188,7 +188,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadDma(string devPath, Device dev, bool retries)
+        static void ReadDma(string devPath, Device dev, bool retries)
         {
             ushort cylinder = 0;
             byte head = 0;
@@ -353,7 +353,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadLong(string devPath, Device dev, bool retries)
+        static void ReadLong(string devPath, Device dev, bool retries)
         {
             ushort cylinder = 0;
             byte head = 0;
@@ -518,7 +518,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadMultiple(string devPath, Device dev)
+        static void ReadMultiple(string devPath, Device dev)
         {
             ushort cylinder = 0;
             byte head = 0;
@@ -683,7 +683,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadSectors(string devPath, Device dev, bool retries)
+        static void ReadSectors(string devPath, Device dev, bool retries)
         {
             ushort cylinder = 0;
             byte head = 0;
@@ -848,7 +848,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void Seek(string devPath, Device dev)
+        static void Seek(string devPath, Device dev)
         {
             ushort cylinder = 0;
             byte head = 0;
diff --git a/DiscImageChef.Tests.Devices/ATA/Atapi.cs b/DiscImageChef.Tests.Devices/ATA/Atapi.cs
index e2dd69c7..1dc5ca21 100644
--- a/DiscImageChef.Tests.Devices/ATA/Atapi.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Atapi.cs
@@ -78,7 +78,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void Identify(string devPath, Device dev)
+        static void Identify(string devPath, Device dev)
         {
             start:
             System.Console.Clear();
diff --git a/DiscImageChef.Tests.Devices/ATA/Cfa.cs b/DiscImageChef.Tests.Devices/ATA/Cfa.cs
index 5a1c0284..73b73b2f 100644
--- a/DiscImageChef.Tests.Devices/ATA/Cfa.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Cfa.cs
@@ -86,7 +86,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void RequestExtendedErrorCode(string devPath, Device dev)
+        static void RequestExtendedErrorCode(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -139,7 +139,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void TranslateSectorChs(string devPath, Device dev)
+        static void TranslateSectorChs(string devPath, Device dev)
         {
             ushort cylinder = 0;
             byte head = 0;
@@ -293,7 +293,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void TranslateSectorLba(string devPath, Device dev)
+        static void TranslateSectorLba(string devPath, Device dev)
         {
             uint lba = 0;
             string strDev;
diff --git a/DiscImageChef.Tests.Devices/ATA/MCPT.cs b/DiscImageChef.Tests.Devices/ATA/MCPT.cs
index b7fe57b4..7762c2a4 100644
--- a/DiscImageChef.Tests.Devices/ATA/MCPT.cs
+++ b/DiscImageChef.Tests.Devices/ATA/MCPT.cs
@@ -78,7 +78,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void CheckMediaCardType(string devPath, Device dev)
+        static void CheckMediaCardType(string devPath, Device dev)
         {
             byte feature = 0;
             string strDev;
diff --git a/DiscImageChef.Tests.Devices/ATA/Smart.cs b/DiscImageChef.Tests.Devices/ATA/Smart.cs
index 89609e99..e03642b9 100644
--- a/DiscImageChef.Tests.Devices/ATA/Smart.cs
+++ b/DiscImageChef.Tests.Devices/ATA/Smart.cs
@@ -106,7 +106,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void DisableAttributeAutosave(string devPath, Device dev)
+        static void DisableAttributeAutosave(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -149,7 +149,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void DisableOperations(string devPath, Device dev)
+        static void DisableOperations(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -192,7 +192,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void EnableAttributeAutosave(string devPath, Device dev)
+        static void EnableAttributeAutosave(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -235,7 +235,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void EnableOperations(string devPath, Device dev)
+        static void EnableOperations(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -278,7 +278,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ExecuteOfflineImmediate(string devPath, Device dev)
+        static void ExecuteOfflineImmediate(string devPath, Device dev)
         {
             byte subcommand = 0;
             string strDev;
@@ -370,7 +370,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadData(string devPath, Device dev)
+        static void ReadData(string devPath, Device dev)
         {
         start:
             System.Console.Clear();
@@ -436,7 +436,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReadLog(string devPath, Device dev)
+        static void ReadLog(string devPath, Device dev)
         {
             byte address = 0;
             string strDev;
@@ -553,7 +553,7 @@ namespace DiscImageChef.Tests.Devices.ATA
             }
         }
 
-        public static void ReturnStatus(string devPath, Device dev)
+        static void ReturnStatus(string devPath, Device dev)
         {
         start:
             System.Console.Clear();