diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index 41ec45a9d..52c11ac07 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -155,7 +155,7 @@ namespace Results
             ///
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Test_volume,       Strings.Test_vol + "()",                                                  Quantity.Volume, ItemCategory.TestData,    (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).TargetVolume())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume,            string.Format("{0} Mt. ()", Strings.VName_Vol), Strings.Tooltip_Vol_Mt,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()", Strings.VName_Vol),  Strings.Tooltip_Vol_rm,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_volume,  string.Format("{0} rm ()",  Strings.VName_Vol), Strings.Tooltip_Vol_rm,   Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeRef)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_main,       string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.main),            Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundMain) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Volume_aux,        string.Format("{0} {1} ()", Strings.VName_Vol,  Strings.aux),             Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.CompoundAux) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeMeter)));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Start_volume,      Strings.Start_volume + "()",                                              Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V4", w.GetMeterTestRslt(t).VolumeStart)));
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
index 9439f44a6..efba95692 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
@@ -21,7 +21,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 		/// 
 		delegate void ErrorsFormDlgt(PulseOutputsTestSeq myRef, IList<GenericDevices.IWaterMeter> waterMeters);
 		/// 
-		void OpenWMErrorsForm(PulseOutputsTestSeq myRef, IList<GenericDevices.IWaterMeter> waterMeters)
+		void OpenWMPulsesForm(PulseOutputsTestSeq myRef, IList<GenericDevices.IWaterMeter> waterMeters)
 		{
 #pragma warning disable 162     /// Disables 'Unreachable code detected' warning
 
@@ -242,7 +242,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 		temperature_set:
 
 			/// Show the modeless dialog with error indication
-			Program.MainWnd.Invoke(new ErrorsFormDlgt(OpenWMErrorsForm), new object[] { this, WaterMeters });
+			Program.MainWnd.Invoke(new ErrorsFormDlgt(OpenWMPulsesForm), new object[] { this, WaterMeters });
 
 		loop:
             int time = StateMachine.Time;
@@ -465,9 +465,11 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 			/// Test 'Quit'
 			if ((modelessDlg is GenericDevices.IHasCompleted) && !(modelessDlg as GenericDevices.IHasCompleted).Completed)
 			{
-				goto loop;			/// Modeless dilaog not closed, keep looping
+                UiBridge.Bridge.OnCloseModelessForm(this, null);    /// Close the modeless dialog
 			}
-			modelessDlg = null;		/// Modeless dialog is closed now
+			modelessDlg = null;		    /// Modeless dialog is closed now
+
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs
index e50bb0796..24648db38 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -7,6 +7,7 @@ using System.IO;
 using System.Xml.Serialization;
 using Config.Entities;
 using TBF.BenchControl.Generic;
+using TBF.BenchControl.Configs.NameOnly;
 
 namespace TBF.BenchControl.TestMethods.PulsesTest
 {
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.cs
deleted file mode 100644
index c5c300e94..000000000
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Windows.Forms;
-using Config.Entities;
-using TBF.BenchControl.Generic;
-
-namespace TBF.BenchControl.TestMethods.PulsesTest
-{
-	public partial class TestMethodCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		TestMethodCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as TestMethodCfg;
-				Redraw();
-			}
-		}
-
-		public TestMethodCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
-		{
-			Redraw();
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			config.Name = nameTextBox.Text;
-
-			return flags;
-		}
-	}
-}
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.designer.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.designer.cs
deleted file mode 100644
index 819f75530..000000000
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.designer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-namespace TBF.BenchControl.TestMethods.PulsesTest
-{
-	partial class TestMethodCfgCtrl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(137, 57);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
-			this.nameTextBox.TabIndex = 5;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(27, 60);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 4;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(134, 33);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 3;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// BasicPrinterCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Name = "BasicPrinterCfgCtrl";
-			this.Size = new System.Drawing.Size(300, 200);
-			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-	}
-}
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.resx b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfgCtrl.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm12.designer.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm12.designer.cs
index e15acadd2..42a0a9906 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm12.designer.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm12.designer.cs
@@ -80,6 +80,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox1.TabIndex = 20;
             this.pulsesCountOKCheckBox1.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox1.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox1.Visible = false;
             // 
             // pulsesCountOKCheckBox2
             // 
@@ -91,6 +92,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox2.TabIndex = 21;
             this.pulsesCountOKCheckBox2.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox2.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox2.Visible = false;
             // 
             // pulsesCountOKCheckBox3
             // 
@@ -102,6 +104,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox3.TabIndex = 22;
             this.pulsesCountOKCheckBox3.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox3.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox3.Visible = false;
             // 
             // pulsesCountOKCheckBox4
             // 
@@ -113,6 +116,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox4.TabIndex = 23;
             this.pulsesCountOKCheckBox4.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox4.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox4.Visible = false;
             // 
             // pulsesCountOKCheckBox5
             // 
@@ -124,6 +128,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox5.TabIndex = 24;
             this.pulsesCountOKCheckBox5.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox5.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox5.Visible = false;
             // 
             // pulsesCountOKCheckBox6
             // 
@@ -135,6 +140,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox6.TabIndex = 25;
             this.pulsesCountOKCheckBox6.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox6.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox6.Visible = false;
             // 
             // pulsesCountOKCheckBox7
             // 
@@ -146,6 +152,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox7.TabIndex = 26;
             this.pulsesCountOKCheckBox7.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox7.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox7.Visible = false;
             // 
             // pulsesCountOKCheckBox8
             // 
@@ -157,6 +164,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox8.TabIndex = 27;
             this.pulsesCountOKCheckBox8.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox8.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox8.Visible = false;
             // 
             // pulsesCountOKCheckBox9
             // 
@@ -168,6 +176,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox9.TabIndex = 28;
             this.pulsesCountOKCheckBox9.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox9.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox9.Visible = false;
             // 
             // pulsesCountOKCheckBox10
             // 
@@ -179,6 +188,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox10.TabIndex = 29;
             this.pulsesCountOKCheckBox10.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox10.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox10.Visible = false;
             // 
             // pulsesCountOKCheckBox11
             // 
@@ -190,6 +200,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox11.TabIndex = 30;
             this.pulsesCountOKCheckBox11.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox11.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox11.Visible = false;
             // 
             // pulsesCountOKCheckBox12
             // 
@@ -201,6 +212,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox12.TabIndex = 31;
             this.pulsesCountOKCheckBox12.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox12.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox12.Visible = false;
             // 
             // wmPulsesCountLabel1
             // 
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
index 09fc77913..5919714c6 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+
 using log4net;
 using Config.Entities;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.designer.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.designer.cs
index 70a84222c..2ab0c931a 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.designer.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/ManualPulsesForm24.designer.cs
@@ -368,6 +368,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox1.TabIndex = 44;
             this.pulsesCountOKCheckBox1.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox1.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox1.Visible = false;
             // 
             // pulsesCountOKCheckBox12
             // 
@@ -379,6 +380,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox12.TabIndex = 55;
             this.pulsesCountOKCheckBox12.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox12.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox12.Visible = false;
             // 
             // pulsesCountOKCheckBox11
             // 
@@ -390,6 +392,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox11.TabIndex = 54;
             this.pulsesCountOKCheckBox11.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox11.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox11.Visible = false;
             // 
             // pulsesCountOKCheckBox10
             // 
@@ -401,6 +404,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox10.TabIndex = 53;
             this.pulsesCountOKCheckBox10.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox10.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox10.Visible = false;
             // 
             // pulsesCountOKCheckBox9
             // 
@@ -412,6 +416,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox9.TabIndex = 52;
             this.pulsesCountOKCheckBox9.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox9.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox9.Visible = false;
             // 
             // pulsesCountOKCheckBox8
             // 
@@ -423,6 +428,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox8.TabIndex = 51;
             this.pulsesCountOKCheckBox8.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox8.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox8.Visible = false;
             // 
             // pulsesCountOKCheckBox7
             // 
@@ -434,6 +440,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox7.TabIndex = 50;
             this.pulsesCountOKCheckBox7.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox7.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox7.Visible = false;
             // 
             // pulsesCountOKCheckBox6
             // 
@@ -445,6 +452,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox6.TabIndex = 49;
             this.pulsesCountOKCheckBox6.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox6.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox6.Visible = false;
             // 
             // pulsesCountOKCheckBox5
             // 
@@ -456,6 +464,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox5.TabIndex = 48;
             this.pulsesCountOKCheckBox5.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox5.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox5.Visible = false;
             // 
             // pulsesCountOKCheckBox4
             // 
@@ -467,6 +476,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox4.TabIndex = 47;
             this.pulsesCountOKCheckBox4.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox4.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox4.Visible = false;
             // 
             // pulsesCountOKCheckBox3
             // 
@@ -478,6 +488,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox3.TabIndex = 46;
             this.pulsesCountOKCheckBox3.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox3.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox3.Visible = false;
             // 
             // pulsesCountOKCheckBox2
             // 
@@ -489,6 +500,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox2.TabIndex = 45;
             this.pulsesCountOKCheckBox2.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox2.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox2.Visible = false;
             // 
             // pulsesCountOKCheckBox13
             // 
@@ -500,6 +512,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox13.TabIndex = 56;
             this.pulsesCountOKCheckBox13.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox13.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox13.Visible = false;
             // 
             // pulsesCountOKCheckBox14
             // 
@@ -511,6 +524,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox14.TabIndex = 57;
             this.pulsesCountOKCheckBox14.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox14.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox14.Visible = false;
             // 
             // pulsesCountOKCheckBox15
             // 
@@ -522,6 +536,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox15.TabIndex = 58;
             this.pulsesCountOKCheckBox15.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox15.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox15.Visible = false;
             // 
             // pulsesCountOKCheckBox16
             // 
@@ -533,6 +548,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox16.TabIndex = 59;
             this.pulsesCountOKCheckBox16.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox16.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox16.Visible = false;
             // 
             // pulsesCountOKCheckBox17
             // 
@@ -544,6 +560,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox17.TabIndex = 60;
             this.pulsesCountOKCheckBox17.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox17.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox17.Visible = false;
             // 
             // pulsesCountOKCheckBox18
             // 
@@ -555,6 +572,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox18.TabIndex = 61;
             this.pulsesCountOKCheckBox18.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox18.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox18.Visible = false;
             // 
             // pulsesCountOKCheckBox19
             // 
@@ -566,6 +584,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox19.TabIndex = 62;
             this.pulsesCountOKCheckBox19.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox19.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox19.Visible = false;
             // 
             // pulsesCountOKCheckBox20
             // 
@@ -577,6 +596,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox20.TabIndex = 63;
             this.pulsesCountOKCheckBox20.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox20.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox20.Visible = false;
             // 
             // pulsesCountOKCheckBox21
             // 
@@ -588,6 +608,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox21.TabIndex = 64;
             this.pulsesCountOKCheckBox21.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox21.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox21.Visible = false;
             // 
             // pulsesCountOKCheckBox22
             // 
@@ -599,6 +620,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox22.TabIndex = 65;
             this.pulsesCountOKCheckBox22.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox22.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox22.Visible = false;
             // 
             // pulsesCountOKCheckBox23
             // 
@@ -610,6 +632,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox23.TabIndex = 66;
             this.pulsesCountOKCheckBox23.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox23.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox23.Visible = false;
             // 
             // pulsesCountOKCheckBox24
             // 
@@ -621,6 +644,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             this.pulsesCountOKCheckBox24.TabIndex = 67;
             this.pulsesCountOKCheckBox24.Text = "Pulses count is OK";
             this.pulsesCountOKCheckBox24.UseVisualStyleBackColor = true;
+            this.pulsesCountOKCheckBox24.Visible = false;
             // 
             // ManualPulsesForm24
             // 
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
index 05ee85af5..7a970a684 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
@@ -465,6 +465,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 			}
 			modelessDlg = null;		/// Modeless dialog is closed now
 
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
 
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 66ef4871c..76af53cf0 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.1014.0")]
-[assembly: AssemblyFileVersion("2.18.1014.0")]
+[assembly: AssemblyVersion("2.18.1015.0")]
+[assembly: AssemblyFileVersion("2.18.1015.0")]
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 9a40bdfde..fd3b95dc5 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -1207,12 +1207,6 @@
     <Compile Include="BenchControl\TestMethods\PulsesTest\Factory.cs" />
     <Compile Include="BenchControl\TestMethods\PulsesTest\TestMethod.cs" />
     <Compile Include="BenchControl\TestMethods\PulsesTest\TestMethodCfg.cs" />
-    <Compile Include="BenchControl\TestMethods\PulsesTest\TestMethodCfgCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="BenchControl\TestMethods\PulsesTest\TestMethodCfgCtrl.designer.cs">
-      <DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="BenchControl\TestMethods\PulsesTest\WMPulsesForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2531,9 +2525,6 @@
     <EmbeddedResource Include="BenchControl\TestMethods\PulsesTestManual\ManualPulsesForm24.resx">
       <DependentUpon>ManualPulsesForm24.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BenchControl\TestMethods\PulsesTest\TestMethodCfgCtrl.resx">
-      <DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="BenchControl\TestMethods\PulsesTest\WMPulsesForm.resx">
       <DependentUpon>WMPulsesForm.cs</DependentUpon>
     </EmbeddedResource>