diff --git a/Adaptation/.editorconfig b/Adaptation/.editorconfig
index d6755a0..b22ed15 100644
--- a/Adaptation/.editorconfig
+++ b/Adaptation/.editorconfig
@@ -122,6 +122,7 @@ dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]cs
 dotnet_diagnostic.IDE0300.severity = none # IDE0300: Collection initialization can be simplified
 dotnet_diagnostic.IDE0301.severity = none #IDE0301: Collection initialization can be simplified
 dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified
+dotnet_diagnostic.MSTEST0037.severity = error # MSTEST0037: Use proper 'Assert' methods
 dotnet_diagnostic.SYSLIB1045.severity = none # SYSLIB1045: diagnostics for regex source generation
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
 dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case
diff --git a/Adaptation/FileHandlers/pcl/Convert.cs b/Adaptation/FileHandlers/pcl/Convert.cs
index 022a0eb..06b8e54 100644
--- a/Adaptation/FileHandlers/pcl/Convert.cs
+++ b/Adaptation/FileHandlers/pcl/Convert.cs
@@ -73,7 +73,7 @@ internal class Convert
                 fileInfoCollection.Add(new FileInfo(altHeaderFileName));
                 result = new(text.Split(new string[] { Environment.NewLine }, StringSplitOptions.None));
             }
-            catch (Exception)
+            catch (MissingMethodException)
             {
                 if (!File.Exists(pdfTextStripperFileName))
                     throw;
diff --git a/Adaptation/FileHandlers/pcl/ProcessData.cs b/Adaptation/FileHandlers/pcl/ProcessData.cs
index 2a29039..ec5065a 100644
--- a/Adaptation/FileHandlers/pcl/ProcessData.cs
+++ b/Adaptation/FileHandlers/pcl/ProcessData.cs
@@ -120,9 +120,13 @@ internal class ProcessData : IProcessData
             if (description.Test != (int)tests[i])
                 throw new Exception();
         }
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.descriptions.json");
         List<Description> fileReadDescriptions = (from l in descriptions select (Description)l).ToList();
         string json = JsonSerializer.Serialize(fileReadDescriptions, fileReadDescriptions.GetType());
-        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json);
+        File.WriteAllText(fileInfo.FullName, json);
+        File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);
+        fileInfoCollection.Add(fileInfo);
+        JsonElement[] jsonElements = JsonSerializer.Deserialize<JsonElement[]>(json) ?? throw new Exception();
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(logistics.Logistics1[0], tests.ToArray(), jsonElements, fileInfoCollection);
         return results;
     }
diff --git a/Adaptation/FileHandlers/pcl/Run.cs b/Adaptation/FileHandlers/pcl/Run.cs
index 2409dbf..89a4c20 100644
--- a/Adaptation/FileHandlers/pcl/Run.cs
+++ b/Adaptation/FileHandlers/pcl/Run.cs
@@ -40,9 +40,9 @@ internal class Run
         return new(results);
     }
 
-    private static void WriteJson(Logistics logistics, List<FileInfo> fileInfoCollection, Run? result)
+    private static void WriteJson(Logistics logistics, List<FileInfo> fileInfoCollection, Run result)
     {
-        FileInfo fileInfo = new($"{logistics.ReportFullPath}.json");
+        FileInfo fileInfo = new($"{logistics.ReportFullPath}.run.json");
         string json = JsonSerializer.Serialize(result, RunSourceGenerationContext.Default.Run);
         File.WriteAllText(fileInfo.FullName, json);
         File.SetLastWriteTime(fileInfo.FullName, logistics.DateTimeFromSequence);
diff --git a/Adaptation/MET08RESIHGCV.Tests.csproj b/Adaptation/MET08RESIHGCV.Tests.csproj
index 09e9603..75430bc 100644
--- a/Adaptation/MET08RESIHGCV.Tests.csproj
+++ b/Adaptation/MET08RESIHGCV.Tests.csproj
@@ -69,7 +69,7 @@
         <PackageReference Include="System.Text.Json" Version="9.0.0" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.1"><NoWarn>NU1701</NoWarn></PackageReference>
+        <PackageReference Include="Infineon.Mesa.PDF.Text.Stripper" Version="4.8.0.2"><NoWarn>NU1701</NoWarn></PackageReference>
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Infineon.Yoda.DotNetCore" Version="5.4.3" />
diff --git a/Adaptation/_Tests/Shared/AdaptationTesting.cs b/Adaptation/_Tests/Shared/AdaptationTesting.cs
index 8a341d4..66cf18e 100644
--- a/Adaptation/_Tests/Shared/AdaptationTesting.cs
+++ b/Adaptation/_Tests/Shared/AdaptationTesting.cs
@@ -1111,7 +1111,7 @@ public class AdaptationTesting : ISMTP
             pdsfFiles = Directory.GetFiles(searchDirectory, searchPattern, SearchOption.TopDirectoryOnly);
             if (pdsfFiles.Length == 0)
                 _ = Process.Start("explorer.exe", searchDirectory);
-            Assert.IsTrue(pdsfFiles.Length != 0, "GetFiles check");
+            Assert.AreNotEqual(0, pdsfFiles.Length, "GetFiles check");
             results = GetLogisticsColumnsAndBody(pdsfFiles[0]);
         }
         Assert.IsFalse(string.IsNullOrEmpty(results.Item1));
@@ -1259,13 +1259,13 @@ public class AdaptationTesting : ISMTP
                 Tuple<string, string[], string[]> pdsf = GetLogisticsColumnsAndBody(variables[2], variables[4]);
                 Tuple<string, string[], string[]> pdsfNew = GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf);
                 CompareSave(variables[5], pdsf, pdsfNew);
-                Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!");
+                Assert.AreEqual(pdsfNew.Item1, pdsf.Item1, "Item1 check!");
                 string[] json = GetItem2(pdsf, pdsfNew);
                 CompareSaveJSON(variables[5], json);
-                Assert.IsTrue(json[0] == json[1], "Item2 check!");
+                Assert.AreEqual(json[1], json[0], "Item2 check!");
                 string[] join = GetItem3(pdsf, pdsfNew);
                 CompareSaveTSV(variables[5], join);
-                Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!");
+                Assert.AreEqual(join[1], join[0], "Item3 (Join) check!");
             }
             UpdatePassDirectory(variables[2]);
         }
diff --git a/Adaptation/_Tests/Static/MET08RESIHGCV.cs b/Adaptation/_Tests/Static/MET08RESIHGCV.cs
index 89c9ce0..6a6a5c9 100644
--- a/Adaptation/_Tests/Static/MET08RESIHGCV.cs
+++ b/Adaptation/_Tests/Static/MET08RESIHGCV.cs
@@ -51,7 +51,7 @@ public class MET08RESIHGCV : LoggingUnitTesting, IDisposable
     public void TestDateTime()
     {
         DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
     }
 
 #if DEBUG
@@ -109,7 +109,7 @@ public class MET08RESIHGCV : LoggingUnitTesting, IDisposable
         float b = 0.3864f;
         float c = 100;
         float d = -9.84601f;
-        Assert.IsTrue((b - a) / a * c == d);
+        Assert.AreEqual(d, (b - a) / a * c);
         NonThrowTryCatch();
     }
 
diff --git a/Adaptation/_Tests/Static/pcl.cs b/Adaptation/_Tests/Static/pcl.cs
index 976bf38..45ed761 100644
--- a/Adaptation/_Tests/Static/pcl.cs
+++ b/Adaptation/_Tests/Static/pcl.cs
@@ -52,7 +52,7 @@ public class PCL : LoggingUnitTesting, IDisposable
     public void TestDateTime()
     {
         DateTime dateTime = DateTime.Now;
-        Assert.IsTrue(dateTime.ToString("M/d/yyyy h:mm:ss tt") == dateTime.ToString());
+        Assert.AreEqual(dateTime.ToString(), dateTime.ToString("M/d/yyyy h:mm:ss tt"));
     }
 
     [TestMethod]
@@ -69,22 +69,22 @@ public class PCL : LoggingUnitTesting, IDisposable
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("12-123456-1234");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("1T123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
-        Assert.IsTrue(descriptor.RDS is "123456");
+        Assert.AreEqual("123456", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
@@ -93,96 +93,96 @@ public class PCL : LoggingUnitTesting, IDisposable
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Employee is "MP");
+        Assert.AreEqual("MP", descriptor.Employee);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         descriptor = ProcessData.GetDescriptor("12-123456-1234.2-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
-        Assert.IsTrue(descriptor.Layer is "2");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
+        Assert.AreEqual("2", descriptor.Layer);
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("12-123456-1234.02-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
-        Assert.IsTrue(descriptor.Layer is "2");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("12", descriptor.Reactor);
+        Assert.AreEqual("123456", descriptor.RDS);
+        Assert.AreEqual("1234", descriptor.PSN);
+        Assert.AreEqual("2", descriptor.Layer);
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.2");
-        Assert.IsTrue(descriptor.Reactor is "20");
+        Assert.AreEqual("20", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.2.1");
-        Assert.IsTrue(descriptor.Layer is "2");
+        Assert.AreEqual("2", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("20", descriptor.Reactor);
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("20.1.1");
-        Assert.IsTrue(descriptor.Layer is "1");
+        Assert.AreEqual("1", descriptor.Layer);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "20");
-        Assert.IsTrue(descriptor.Zone is "1");
+        Assert.AreEqual("20", descriptor.Reactor);
+        Assert.AreEqual("1", descriptor.Zone);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("P2-LOW-RR");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "RR");
+        Assert.AreEqual("RR", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "P2");
+        Assert.AreEqual("P2", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("i171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "i171308.1.51");
+        Assert.AreEqual("i171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("o171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "o171308.1.51");
+        Assert.AreEqual("o171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("O171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "O171308.1.51");
+        Assert.AreEqual("O171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("171308.1.51");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
-        Assert.IsTrue(descriptor.RDS is "171308.1.51");
+        Assert.AreEqual("171308.1.51", descriptor.RDS);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("75-QP1414-SPLIT4");
-        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Lot));
+        Assert.IsFalse(string.IsNullOrEmpty(descriptor.Lot));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
-        Assert.IsTrue(descriptor.PSN is "SPLIT4");
+        Assert.AreEqual("SPLIT4", descriptor.PSN);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
-        Assert.IsTrue(descriptor.Reactor is "75");
+        Assert.AreEqual("75", descriptor.Reactor);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         descriptor = ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Lot == "B48");
+        Assert.AreEqual("B48", descriptor.Lot);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));