diff --git a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
index a5d0cf8e0..18970a877 100644
--- a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+++ b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
@@ -340,6 +340,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 
             try
             {
+                /// Prepare a procedure signature to distinguish between different procedures with the same wmTypeId
                 IList<string> wmTestNames = new List<string>();
                 StringBuilder procedureSignatureSB = new StringBuilder();
                 foreach (var mtr in wm.MeterTestRslts)
@@ -351,6 +352,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
 
                 if (oracleTestInfo == null || (wmTypeId == 0) || (wmTypeId != wm.WaterMeterData.WMTypeId) || (procedureSignature != procedureSignatureSB.ToString()))
                 {
+                    ///
+                    /// Currnet test info. is not walid => Get a new one from Oracle and SensusTestInfo table
+                    ///
                     int wmTR;
                     IList<SensusTestInfo> rti = GetOracleTestInfo(conn, wm.WaterMeterData.WMTypeId, out wmTR);
 
@@ -363,13 +367,6 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
                         oracleTestInfo = rti;
                         completeTestInfo = SensusTestInfo.GetBestMatch(rti, wmTestNames);
 
-                        /// Write to WaterMeter entity
-                        wm.RawTestInfos = rti;
-                        wm.CompleteTestInfos = completeTestInfo;
-                        wm.WMTypeRevision = wmTR;
-                        Sequences.ProcessData.RawTestInfos = rti;
-                        Sequences.ProcessData.CompleteTestInfos = completeTestInfo;
-
                         foreach (var cti in completeTestInfo)
                         {
                             log.WarnFormat("Selected test info : ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4} PrfNrOpto={5} QBzOpto={6} PrfNrLog={7} QBzLog={8} Range={9}", wmTypeId, wmTypeRevision,
@@ -382,6 +379,16 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
                     }
                 }
 
+                /// Write the test info. to WaterMeter entity
+                wm.RawTestInfos = oracleTestInfo;
+                wm.CompleteTestInfos = completeTestInfo;
+                wm.WMTypeRevision = wmTypeRevision;
+
+                /// Write the test info. to ProcessData
+                Sequences.ProcessData.RawTestInfos = oracleTestInfo;
+                Sequences.ProcessData.CompleteTestInfos = completeTestInfo;
+
+
                 OracleCommand cmd;
                 OracleDataReader dr;
 
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 1ad8aff6c..ecf33412c 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.1197.0")]
-[assembly: AssemblyFileVersion("2.18.1197.0")]
+[assembly: AssemblyVersion("2.18.1198.0")]
+[assembly: AssemblyFileVersion("2.18.1198.0")]