diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index fbf3f6f66..2830f45a2 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1205.0")]
-[assembly: AssemblyFileVersion("2.18.1205.0")]
+[assembly: AssemblyVersion("2.18.1208.0")]
+[assembly: AssemblyFileVersion("2.18.1208.0")]
diff --git a/Results/Utils.cs b/Results/Utils.cs
index 763a26da0..b771c3281 100644
--- a/Results/Utils.cs
+++ b/Results/Utils.cs
@@ -11,6 +11,7 @@ namespace Results
 	{
 		public static string GetTestName(string name, int repeats, int repetitionNr)
 		{
+            if (name == null) return null;
 			if (repeats == 1) return name;
 			return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
 		}
diff --git a/TBF/BenchControl/Output/SensusTestInfo.cs b/TBF/BenchControl/Output/SensusTestInfo.cs
index 415da3f8e..ccf0e3dbf 100644
--- a/TBF/BenchControl/Output/SensusTestInfo.cs
+++ b/TBF/BenchControl/Output/SensusTestInfo.cs
@@ -256,15 +256,15 @@ namespace TBF.BenchControl.Output
                     return new SensusTestInfo[]
                     {
                         ///                TBF             Oracle DB   Opto RAW   LU logfiles 
-                        new SensusTestInfo("Q3_lr (1/3)",   5, "Q3",    9, "09",  9, "Q3",   Range.R90_100),
-                        new SensusTestInfo("Q3_lr (2/3)",   5, "Q3",    8, "08",  8, "Q3",   Range.R90_100),
-                        new SensusTestInfo("Q3_lr (3/3)",   5, "Q3",    7, "07",  7, "Q3",   Range.R90_100),
-                        new SensusTestInfo("Q2ac_lr (1/3)", 2, "Q2ac",  6, "06",  6, "Q2ac", Range.R100_110),
-                        new SensusTestInfo("Q2ac_lr (2/3)", 2, "Q2ac",  5, "05",  5, "Q2ac", Range.R100_110),
-                        new SensusTestInfo("Q2ac_lr (3/3)", 2, "Q2ac",  4, "04",  4, "Q2ac", Range.R100_110),
-                        new SensusTestInfo("Q1_lr (1/3)",   1, "Q1",    3, "03",  3, "Q1",   Range.R100_110),
-                        new SensusTestInfo("Q1_lr (2/3)",   1, "Q1",    2, "02",  2, "Q1",   Range.R100_110),
-                        new SensusTestInfo("Q1_lr (3/3)",   1, "Q1",    1, "01",  1, "Q1",   Range.R100_110),
+                        new SensusTestInfo("Q3_lr (1/3)",   5, "Q3",    9, "09",  9, "Q3 1/3",   Range.R90_100),
+                        new SensusTestInfo("Q3_lr (2/3)",   5, "Q3",    8, "08",  8, "Q3 2/3",   Range.R90_100),
+                        new SensusTestInfo("Q3_lr (3/3)",   5, "Q3",    7, "07",  7, "Q3 3/3",   Range.R90_100),
+                        new SensusTestInfo("Q2ac_lr (1/3)", 2, "Q2ac",  6, "06",  6, "Q2ac 1/3", Range.R100_110),
+                        new SensusTestInfo("Q2ac_lr (2/3)", 2, "Q2ac",  5, "05",  5, "Q2ac 2/3", Range.R100_110),
+                        new SensusTestInfo("Q2ac_lr (3/3)", 2, "Q2ac",  4, "04",  4, "Q2ac 3/3", Range.R100_110),
+                        new SensusTestInfo("Q1_lr (1/3)",   1, "Q1",    3, "03",  3, "Q1 1/3",   Range.R100_110),
+                        new SensusTestInfo("Q1_lr (2/3)",   1, "Q1",    2, "02",  2, "Q1 2/3",   Range.R100_110),
+                        new SensusTestInfo("Q1_lr (3/3)",   1, "Q1",    1, "01",  1, "Q1 3/3",   Range.R100_110),
                     };
 
                 case LogType.Suez_EMP_DN15:
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
index cb94a6245..8a8a7aa16 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
@@ -560,9 +560,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
             ///
             if (testInfos != null)
             {
+                string fullTestName = Results.Utils.GetTestName(testName, testRepeats, repetitionNr);
                 foreach (var ti in testInfos)
                 {
-                    if ((ti.PruefungsNrOpto != 0) && (ti.TestName == testName))
+                    if ((ti.PruefungsNrOpto != 0) && (ti.TestName == fullTestName))
                     {
                         optoDataLogFileName = string.Format("{0}_{1}_{2}_{3}.txt",
                                                             (ConfigStruct != null) ? ConfigStruct.GetPcbNrString() : "UnknownPcbNr",
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 109b67829..ebe573970 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.1207.0")]
-[assembly: AssemblyFileVersion("2.18.1207.0")]
+[assembly: AssemblyVersion("2.18.1208.0")]
+[assembly: AssemblyFileVersion("2.18.1208.0")]
diff --git a/Users/Properties/AssemblyInfo.cs b/Users/Properties/AssemblyInfo.cs
index e57c62fc7..0a54dd826 100644
--- a/Users/Properties/AssemblyInfo.cs
+++ b/Users/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.1006.0")]
-[assembly: AssemblyFileVersion("2.18.1006.0")]
+[assembly: AssemblyVersion("2.18.1208.0")]
+[assembly: AssemblyFileVersion("2.18.1208.0")]