diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3-EQPT.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3-EQPT.cs
index c0cd5b3..717aa5f 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3-EQPT.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3-EQPT.cs
@@ -54,11 +54,7 @@ public class HGCV3_EQPT : EAFLoggingUnitTesting
         string check = "WafrMeas.log|.RsM";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs
index 54d5b12..b1d22e6 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/HGCV3.cs
@@ -54,11 +54,7 @@ public class HGCV3 : EAFLoggingUnitTesting
         string check = "*.RsM";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
diff --git a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs
index eebad15..1efa477 100644
--- a/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs
+++ b/Adaptation/_Tests/CreateSelfDescription/Staging/v2.39.0/MET08RESIHGCV.cs
@@ -54,11 +54,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToOpenInsightMetrologyViewer";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -68,11 +64,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToIQSSi";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -82,11 +74,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToOpenInsight";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -96,11 +84,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToOpenInsightMetrologyViewerAttachments";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -110,11 +94,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToAPC";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -124,11 +104,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToSPaCe";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -138,11 +114,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsXToArchive";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -152,11 +124,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsArchive";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
@@ -166,11 +134,7 @@ public class MET08RESIHGCV : EAFLoggingUnitTesting
         string check = "~IsDummy";
         MethodBase methodBase = new StackFrame().GetMethod();
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        string[] fileNameAndJson = EAFLoggingUnitTesting.AdaptationTesting.GetConfiguration(methodBase);
-        Assert.IsTrue(fileNameAndJson[1].Contains(check));
-        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
-        IFileRead fileRead = EAFLoggingUnitTesting.AdaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
-        Assert.IsFalse(string.IsNullOrEmpty(fileRead.CellInstanceConnectionName));
+        _ = Helpers.Metrology.GetWriteConfigurationGetFileRead(methodBase, check, EAFLoggingUnitTesting.AdaptationTesting);
         EAFLoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 
diff --git a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIHGCV.cs b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIHGCV.cs
index d3f3f72..152c384 100644
--- a/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIHGCV.cs
+++ b/Adaptation/_Tests/Extract/Staging/v2.39.0/MET08RESIHGCV.cs
@@ -36,23 +36,9 @@ public class MET08RESIHGCV
         MethodBase methodBase = new StackFrame().GetMethod();
         _MET08RESIHGCV.Staging__v2_39_0__MET08RESIHGCV__MET08RESIHGCV();
         string[] variables = _MET08RESIHGCV.AdaptationTesting.GetVariables(methodBase, check);
-        Tuple<string, string[], string[]> pdsf = Helpers.Metrology.GetLogisticsColumnsAndBody(variables[2], variables[4]);
         IFileRead fileRead = _MET08RESIHGCV.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
-        Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResult = fileRead.ReExtract();
-        Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1));
-        Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!");
-        Assert.IsNotNull(extractResult.Item4);
         Logistics logistics = new(fileRead);
-        Tuple<string, string[], string[]> pdsfNew = Helpers.Metrology.GetLogisticsColumnsAndBody(fileRead, logistics, extractResult, pdsf);
-        Helpers.Metrology.CompareSave(variables[5], pdsf, pdsfNew);
-        Assert.IsTrue(pdsf.Item1 == pdsfNew.Item1, "Item1 check!");
-        string[] json = Helpers.Metrology.GetItem2(pdsf, pdsfNew);
-        Helpers.Metrology.CompareSaveJSON(variables[5], json);
-        Assert.IsTrue(json[0] == json[1], "Item2 check!");
-        string[] join = Helpers.Metrology.GetItem3(pdsf, pdsfNew);
-        Helpers.Metrology.CompareSaveTSV(variables[5], join);
-        Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!");
-        Helpers.Metrology.UpdatePassDirectory(variables[2]);
+        _ = Helpers.Metrology.ReExtractComapareUpdatePassDirectory(variables, fileRead, logistics);
     }
 
     [TestMethod]
diff --git a/Adaptation/_Tests/Helpers/Metrology.cs b/Adaptation/_Tests/Helpers/Metrology.cs
index 0d41570..d397324 100644
--- a/Adaptation/_Tests/Helpers/Metrology.cs
+++ b/Adaptation/_Tests/Helpers/Metrology.cs
@@ -153,4 +153,37 @@ public class Metrology
         }
     }
 
+    internal static IFileRead GetWriteConfigurationGetFileRead(MethodBase methodBase, string check, Shared.AdaptationTesting adaptationTesting)
+    {
+        IFileRead result;
+        string[] fileNameAndJson = adaptationTesting.GetConfiguration(methodBase);
+        Assert.IsTrue(fileNameAndJson[1].Contains(check));
+        File.WriteAllText(fileNameAndJson[0], fileNameAndJson[1]);
+        result = adaptationTesting.Get(methodBase, sourceFileLocation: string.Empty, sourceFileFilter: string.Empty, useCyclicalForDescription: false);
+        Assert.IsFalse(string.IsNullOrEmpty(result.CellInstanceConnectionName));
+        return result;
+    }
+
+    internal static string ReExtractComapareUpdatePassDirectory(string[] variables, IFileRead fileRead, Logistics logistics)
+    {
+        string result;
+        Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResult = fileRead.ReExtract();
+        Assert.IsFalse(string.IsNullOrEmpty(extractResult?.Item1));
+        Assert.IsTrue(extractResult.Item3.Length > 0, "extractResult Array Length check!");
+        Assert.IsNotNull(extractResult.Item4);
+        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!");
+        string[] json = GetItem2(pdsf, pdsfNew);
+        CompareSaveJSON(variables[5], json);
+        Assert.IsTrue(json[0] == json[1], "Item2 check!");
+        string[] join = GetItem3(pdsf, pdsfNew);
+        CompareSaveTSV(variables[5], join);
+        Assert.IsTrue(join[0] == join[1], "Item3 (Join) check!");
+        UpdatePassDirectory(variables[2]);
+        result = extractResult.Item1;
+        return result;
+    }
+
 }
\ No newline at end of file