diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram
index a90fdcc5f8761..3f8c12789771c 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Iskra_AM550.telegram
@@ -1,38 +1,38 @@
-/ISK5\2M550T-1012
-
-1-3:0.2.8(50)
-0-0:1.0.0(180104231941W)
-0-0:96.1.1(4530303434303036393033333132393137)
-1-0:1.8.1(000156.167*kWh)
-1-0:1.8.2(000071.546*kWh)
-1-0:2.8.1(000000.000*kWh)
-1-0:2.8.2(000000.000*kWh)
-0-0:96.14.0(0001)
-1-0:1.7.0(00.519*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00009)
-0-0:96.7.9(00005)
-1-0:99.97.0(2)(0-0:96.7.19)(170609063239S)(0000000267*s)(170611001706S)(0000149657*s)
-1-0:32.32.0(00000)
-1-0:52.32.0(00000)
-1-0:72.32.0(00000)
-1-0:32.36.0(00002)
-1-0:52.36.0(00002)
-1-0:72.36.0(00002)
-0-0:96.13.0()
-1-0:32.7.0(234.8*V)
-1-0:52.7.0(232.1*V)
-1-0:72.7.0(235.3*V)
-1-0:31.7.0(000*A)
-1-0:51.7.0(001*A)
-1-0:71.7.0(001*A)
-1-0:21.7.0(00.122*kW)
-1-0:41.7.0(00.237*kW)
-1-0:61.7.0(00.158*kW)
-1-0:22.7.0(00.000*kW)
-1-0:42.7.0(00.000*kW)
-1-0:62.7.0(00.000*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(4730303339303031373633333738373137)
-0-1:24.2.1(180104231507W)(00212.529*m3)
-!D82C
+/ISK5\2M550T-1012
+
+1-3:0.2.8(50)
+0-0:1.0.0(180104231941W)
+0-0:96.1.1(4530303434303036393033333132393137)
+1-0:1.8.1(000156.167*kWh)
+1-0:1.8.2(000071.546*kWh)
+1-0:2.8.1(000000.000*kWh)
+1-0:2.8.2(000000.000*kWh)
+0-0:96.14.0(0001)
+1-0:1.7.0(00.519*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00009)
+0-0:96.7.9(00005)
+1-0:99.97.0(2)(0-0:96.7.19)(170609063239S)(0000000267*s)(170611001706S)(0000149657*s)
+1-0:32.32.0(00000)
+1-0:52.32.0(00000)
+1-0:72.32.0(00000)
+1-0:32.36.0(00002)
+1-0:52.36.0(00002)
+1-0:72.36.0(00002)
+0-0:96.13.0()
+1-0:32.7.0(234.8*V)
+1-0:52.7.0(232.1*V)
+1-0:72.7.0(235.3*V)
+1-0:31.7.0(000*A)
+1-0:51.7.0(001*A)
+1-0:71.7.0(001*A)
+1-0:21.7.0(00.122*kW)
+1-0:41.7.0(00.237*kW)
+1-0:61.7.0(00.158*kW)
+1-0:22.7.0(00.000*kW)
+1-0:42.7.0(00.000*kW)
+1-0:62.7.0(00.000*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(4730303339303031373633333738373137)
+0-1:24.2.1(180104231507W)(00212.529*m3)
+!D82C
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram
index 3f3ae8bf941ad..a197fa8008aac 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_E350.telegram
@@ -1,12 +1,12 @@
-/XMX5XMXABCE000015779
-0-0:96.1.1(31323639333037322020202020202020)
-1-0:1.8.1(07654.321*kWh)
-1-0:1.8.2(01234.567*kWh)
-1-0:2.8.1(00000.000*kWh)
-1-0:2.8.2(00000.000*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(0000.32*kW)
-1-0:2.7.0(0000.00*kW)
-0-0:96.13.1()
-0-0:96.13.0()
-!
+/XMX5XMXABCE000015779
+0-0:96.1.1(31323639333037322020202020202020)
+1-0:1.8.1(07654.321*kWh)
+1-0:1.8.2(01234.567*kWh)
+1-0:2.8.1(00000.000*kWh)
+1-0:2.8.2(00000.000*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(0000.32*kW)
+1-0:2.7.0(0000.00*kW)
+0-0:96.13.1()
+0-0:96.13.0()
+!
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram
index 874b76a93d3a6..62a42262c9d9d 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Landis_Gyr_ZCF110.telegram
@@ -1,26 +1,26 @@
-/XMX5LGBBFG1012530239
-
-1-3:0.2.8(42)
-0-0:1.0.0(161116201035W)
-0-0:96.1.1(4530303331303033323737383938383136)
-1-0:1.8.1(000075.067*kWh)
-1-0:1.8.2(000084.813*kWh)
-1-0:2.8.1(000000.000*kWh)
-1-0:2.8.2(000000.000*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(02.778*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00002)
-0-0:96.7.9(00000)
-1-0:99.97.0(0)(0-0:96.7.19)
-1-0:32.32.0(00000)
-1-0:32.36.0(00000)
-0-0:96.13.1()
-0-0:96.13.0()
-1-0:31.7.0(012*A)
-1-0:21.7.0(02.778*kW)
-1-0:22.7.0(00.000*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(4730303435303031363038313037323136)
-0-1:24.2.1(161116200000W)(00066.405*m3)
-!CC1E
+/XMX5LGBBFG1012530239
+
+1-3:0.2.8(42)
+0-0:1.0.0(161116201035W)
+0-0:96.1.1(4530303331303033323737383938383136)
+1-0:1.8.1(000075.067*kWh)
+1-0:1.8.2(000084.813*kWh)
+1-0:2.8.1(000000.000*kWh)
+1-0:2.8.2(000000.000*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(02.778*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00002)
+0-0:96.7.9(00000)
+1-0:99.97.0(0)(0-0:96.7.19)
+1-0:32.32.0(00000)
+1-0:32.36.0(00000)
+0-0:96.13.1()
+0-0:96.13.0()
+1-0:31.7.0(012*A)
+1-0:21.7.0(02.778*kW)
+1-0:22.7.0(00.000*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(4730303435303031363038313037323136)
+0-1:24.2.1(161116200000W)(00066.405*m3)
+!CC1E
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram
index 5c80697dc8a9f..5db1db61ac296 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/Sagemcom_XS210.telegram
@@ -1,33 +1,33 @@
-/KFM5KAIFA-METER
-
-1-3:0.2.8(42)
-0-0:1.0.0(171119202357W)
-0-0:96.1.1(4530303236303030303130363837393134)
-1-0:1.8.1(003095.599*kWh)
-1-0:1.8.2(003283.520*kWh)
-1-0:2.8.1(000000.000*kWh)
-1-0:2.8.2(000000.000*kWh)
-0-0:96.14.0(0001)
-1-0:1.7.0(00.526*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00012)
-0-0:96.7.9(00005)
-1-0:99.97.0(5)(0-0:96.7.19)(170615124004S)(0000015270*s)(160504100552S)(0000000186*s)(160422115631S)(0000001201*s)(160420145748S)(0000000611*s)(000101000001W)(2147483647*s)
-1-0:32.32.0(00000)
-1-0:52.32.0(00000)
-1-0:72.32.0(00000)
-1-0:32.36.0(00000)
-1-0:52.36.0(00000)
-1-0:72.36.0(00000)
-0-0:96.13.1()
-0-0:96.13.0()
-1-0:31.7.0(001*A)
-1-0:51.7.0(000*A)
-1-0:71.7.0(000*A)
-1-0:21.7.0(00.401*kW)
-1-0:22.7.0(00.000*kW)
-1-0:41.7.0(00.123*kW)
-1-0:42.7.0(00.000*kW)
-1-0:61.7.0(00.001*kW)
-1-0:62.7.0(00.000*kW)
-!AD4B
+/KFM5KAIFA-METER
+
+1-3:0.2.8(42)
+0-0:1.0.0(171119202357W)
+0-0:96.1.1(4530303236303030303130363837393134)
+1-0:1.8.1(003095.599*kWh)
+1-0:1.8.2(003283.520*kWh)
+1-0:2.8.1(000000.000*kWh)
+1-0:2.8.2(000000.000*kWh)
+0-0:96.14.0(0001)
+1-0:1.7.0(00.526*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00012)
+0-0:96.7.9(00005)
+1-0:99.97.0(5)(0-0:96.7.19)(170615124004S)(0000015270*s)(160504100552S)(0000000186*s)(160422115631S)(0000001201*s)(160420145748S)(0000000611*s)(000101000001W)(2147483647*s)
+1-0:32.32.0(00000)
+1-0:52.32.0(00000)
+1-0:72.32.0(00000)
+1-0:32.36.0(00000)
+1-0:52.36.0(00000)
+1-0:72.36.0(00000)
+0-0:96.13.1()
+0-0:96.13.0()
+1-0:31.7.0(001*A)
+1-0:51.7.0(000*A)
+1-0:71.7.0(000*A)
+1-0:21.7.0(00.401*kW)
+1-0:22.7.0(00.000*kW)
+1-0:41.7.0(00.123*kW)
+1-0:42.7.0(00.000*kW)
+1-0:61.7.0(00.001*kW)
+1-0:62.7.0(00.000*kW)
+!AD4B
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram
index fd32cf1df0f83..a257b05407026 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/ace4000.telegram
@@ -1,38 +1,38 @@
-/ACE5ACE4KGPRS
-
-0-0:96.1.0*255(1234567890123456)
-1-0:1.8.0*255(012345.074*kWh)
-1-0:1.8.1*255(012345.074*kWh)
-1-0:2.8.0*255(000000.000*kWh)
-1-0:2.8.1*255(000000.000*kWh)
-0-0:96.14.0*255(01)
-1-0:15.7.0*255(000123*W)
-0-0:17.0.0*255(0085*A)
-0-0:96.3.10*255(1)
-0-3:96.1.0*255(12345678         )
-7-0:23.1.0*255(01238.740*m3)(19-01-01 00:00:00)
-7-0:23.1.0*255(01238.770*m3)(19-01-01 01:00:00)
-7-0:23.1.0*255(01238.810*m3)(19-01-01 02:00:00)
-7-0:23.1.0*255(01238.830*m3)(19-01-01 03:00:00)
-7-0:23.1.0*255(01238.830*m3)(19-01-01 04:00:00)
-7-0:23.1.0*255(01238.930*m3)(19-01-01 05:00:00)
-7-0:23.1.0*255(01239.340*m3)(19-01-01 06:00:00)
-7-0:23.1.0*255(01239.540*m3)(19-01-01 07:00:00)
-7-0:23.1.0*255(01239.660*m3)(19-01-01 08:00:00)
-7-0:23.1.0*255(01239.860*m3)(19-01-01 09:00:00)
-7-0:23.1.0*255(01240.090*m3)(19-01-01 10:00:00)
-7-0:23.1.0*255(01240.540*m3)(19-01-01 11:00:00)
-7-0:23.1.0*255(01240.560*m3)(19-01-01 12:00:00)
-7-0:23.1.0*255(01240.690*m3)(19-01-01 13:00:00)
-7-0:23.1.0*255(01237.560*m3)(18-12-31 14:00:00)
-7-0:23.1.0*255(01237.560*m3)(18-12-31 15:00:00)
-7-0:23.1.0*255(01237.760*m3)(18-12-31 16:00:00)
-7-0:23.1.0*255(01237.840*m3)(18-12-31 17:00:00)
-7-0:23.1.0*255(01238.110*m3)(18-12-31 18:00:00)
-7-0:23.1.0*255(01238.390*m3)(18-12-31 19:00:00)
-7-0:23.1.0*255(01238.440*m3)(18-12-31 20:00:00)
-7-0:23.1.0*255(01238.590*m3)(18-12-31 21:00:00)
-7-0:23.1.0*255(01238.680*m3)(18-12-31 22:00:00)
-7-0:23.1.0*255(01238.700*m3)(18-12-31 23:00:00)
-7-0:24.4.0*255(0)
-!
+/ACE5ACE4KGPRS
+
+0-0:96.1.0*255(1234567890123456)
+1-0:1.8.0*255(012345.074*kWh)
+1-0:1.8.1*255(012345.074*kWh)
+1-0:2.8.0*255(000000.000*kWh)
+1-0:2.8.1*255(000000.000*kWh)
+0-0:96.14.0*255(01)
+1-0:15.7.0*255(000123*W)
+0-0:17.0.0*255(0085*A)
+0-0:96.3.10*255(1)
+0-3:96.1.0*255(12345678         )
+7-0:23.1.0*255(01238.740*m3)(19-01-01 00:00:00)
+7-0:23.1.0*255(01238.770*m3)(19-01-01 01:00:00)
+7-0:23.1.0*255(01238.810*m3)(19-01-01 02:00:00)
+7-0:23.1.0*255(01238.830*m3)(19-01-01 03:00:00)
+7-0:23.1.0*255(01238.830*m3)(19-01-01 04:00:00)
+7-0:23.1.0*255(01238.930*m3)(19-01-01 05:00:00)
+7-0:23.1.0*255(01239.340*m3)(19-01-01 06:00:00)
+7-0:23.1.0*255(01239.540*m3)(19-01-01 07:00:00)
+7-0:23.1.0*255(01239.660*m3)(19-01-01 08:00:00)
+7-0:23.1.0*255(01239.860*m3)(19-01-01 09:00:00)
+7-0:23.1.0*255(01240.090*m3)(19-01-01 10:00:00)
+7-0:23.1.0*255(01240.540*m3)(19-01-01 11:00:00)
+7-0:23.1.0*255(01240.560*m3)(19-01-01 12:00:00)
+7-0:23.1.0*255(01240.690*m3)(19-01-01 13:00:00)
+7-0:23.1.0*255(01237.560*m3)(18-12-31 14:00:00)
+7-0:23.1.0*255(01237.560*m3)(18-12-31 15:00:00)
+7-0:23.1.0*255(01237.760*m3)(18-12-31 16:00:00)
+7-0:23.1.0*255(01237.840*m3)(18-12-31 17:00:00)
+7-0:23.1.0*255(01238.110*m3)(18-12-31 18:00:00)
+7-0:23.1.0*255(01238.390*m3)(18-12-31 19:00:00)
+7-0:23.1.0*255(01238.440*m3)(18-12-31 20:00:00)
+7-0:23.1.0*255(01238.590*m3)(18-12-31 21:00:00)
+7-0:23.1.0*255(01238.680*m3)(18-12-31 22:00:00)
+7-0:23.1.0*255(01238.700*m3)(18-12-31 23:00:00)
+7-0:24.4.0*255(0)
+!
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram
index 4398d97e69be7..596039ffbbd51 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_40.telegram
@@ -1,36 +1,36 @@
-/ISk5\2MT382-1000
-1-3:0.2.8(40)
-0-0:1.0.0(101209113020W)
-0-0:96.1.1(4B384547303034303436333935353037)
-1-0:1.8.1(123456.789*kWh)
-1-0:1.8.2(123456.789*kWh)
-1-0:2.8.1(123456.789*kWh)
-1-0:2.8.2(123456.789*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(01.193*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00004)
-0-0:96.7.9(00002)
-1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
-1-0:32.32.0(00002)
-1-0:52.32.0(00001)
-1-0:72.32.0(00000)
-1-0:32.36.0(00000)
-1-0:52.36.0(00003)
-1-0:72.36.0(00000)
-0-0:96.13.1(3031203631203831)
-0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
-3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
-1-0:31.7.0.255(001*A)
-1-0:51.7.0.255(002*A)
-1-0:71.7.0.255(003*A)
-1-0:21.7.0.255(01.111*kW)
-1-0:41.7.0.255(02.222*kW)
-1-0:61.7.0.255(03.333*kW)
-1-0:22.7.0.255(04.444*kW)
-1-0:42.7.0.255(05.555*kW)
-1-0:62.7.0.255(06.666*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(3232323241424344313233343536373839)
-0-1:24.2.1(101209110000W)(12785.123*m3)
-!1CBD
+/ISk5\2MT382-1000
+1-3:0.2.8(40)
+0-0:1.0.0(101209113020W)
+0-0:96.1.1(4B384547303034303436333935353037)
+1-0:1.8.1(123456.789*kWh)
+1-0:1.8.2(123456.789*kWh)
+1-0:2.8.1(123456.789*kWh)
+1-0:2.8.2(123456.789*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(01.193*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00004)
+0-0:96.7.9(00002)
+1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
+1-0:32.32.0(00002)
+1-0:52.32.0(00001)
+1-0:72.32.0(00000)
+1-0:32.36.0(00000)
+1-0:52.36.0(00003)
+1-0:72.36.0(00000)
+0-0:96.13.1(3031203631203831)
+0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
+3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
+1-0:31.7.0.255(001*A)
+1-0:51.7.0.255(002*A)
+1-0:71.7.0.255(003*A)
+1-0:21.7.0.255(01.111*kW)
+1-0:41.7.0.255(02.222*kW)
+1-0:61.7.0.255(03.333*kW)
+1-0:22.7.0.255(04.444*kW)
+1-0:42.7.0.255(05.555*kW)
+1-0:62.7.0.255(06.666*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(3232323241424344313233343536373839)
+0-1:24.2.1(101209110000W)(12785.123*m3)
+!1CBD
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_42.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_42.telegram
index 2cc242afa8b9e..7e37a7c9008b7 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_42.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_42.telegram
@@ -1,36 +1,36 @@
-/ISk5\2MT382-1000
-1-3:0.2.8(42)
-0-0:1.0.0(101209113020W)
-0-0:96.1.1(4B384547303034303436333935353037)
-1-0:1.8.1(123456.789*kWh)
-1-0:1.8.2(123456.789*kWh)
-1-0:2.8.1(123456.789*kWh)
-1-0:2.8.2(123456.789*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(01.193*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00004)
-0-0:96.7.9(00002)
-1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
-1-0:32.32.0(00002)
-1-0:52.32.0(00001)
-1-0:72.32.0(00000)
-1-0:32.36.0(00000)
-1-0:52.36.0(00003)
-1-0:72.36.0(00000)
-0-0:96.13.1(3031203631203831)
-0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
-3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
-1-0:31.7.0.255(001*A)
-1-0:51.7.0.255(002*A)
-1-0:71.7.0.255(003*A)
-1-0:21.7.0.255(01.111*kW)
-1-0:41.7.0.255(02.222*kW)
-1-0:61.7.0.255(03.333*kW)
-1-0:22.7.0.255(04.444*kW)
-1-0:42.7.0.255(05.555*kW)
-1-0:62.7.0.255(06.666*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(3232323241424344313233343536373839)
-0-1:24.2.1(101209110000W)(12785.123*m3)
-!A5E4
+/ISk5\2MT382-1000
+1-3:0.2.8(42)
+0-0:1.0.0(101209113020W)
+0-0:96.1.1(4B384547303034303436333935353037)
+1-0:1.8.1(123456.789*kWh)
+1-0:1.8.2(123456.789*kWh)
+1-0:2.8.1(123456.789*kWh)
+1-0:2.8.2(123456.789*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(01.193*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00004)
+0-0:96.7.9(00002)
+1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
+1-0:32.32.0(00002)
+1-0:52.32.0(00001)
+1-0:72.32.0(00000)
+1-0:32.36.0(00000)
+1-0:52.36.0(00003)
+1-0:72.36.0(00000)
+0-0:96.13.1(3031203631203831)
+0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
+3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
+1-0:31.7.0.255(001*A)
+1-0:51.7.0.255(002*A)
+1-0:71.7.0.255(003*A)
+1-0:21.7.0.255(01.111*kW)
+1-0:41.7.0.255(02.222*kW)
+1-0:61.7.0.255(03.333*kW)
+1-0:22.7.0.255(04.444*kW)
+1-0:42.7.0.255(05.555*kW)
+1-0:62.7.0.255(06.666*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(3232323241424344313233343536373839)
+0-1:24.2.1(101209110000W)(12785.123*m3)
+!A5E4
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_50.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_50.telegram
index a15b44e0cb4b6..100363d9dfae7 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_50.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/dsmr_50.telegram
@@ -1,38 +1,38 @@
-/ISk5\2MT382-1000
-1-3:0.2.8(50)
-0-0:1.0.0(101209113020W)
-0-0:96.1.1(4B384547303034303436333935353037)
-1-0:1.8.1(123456.789*kWh)
-1-0:1.8.2(123456.789*kWh)
-1-0:2.8.1(123456.789*kWh)
-1-0:2.8.2(123456.789*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(01.193*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00004)
-0-0:96.7.9(00002)
-1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
-1-0:32.32.0(00002)
-1-0:52.32.0(00001)
-1-0:72.32.0(00000)
-1-0:32.36.0(00000)
-1-0:52.36.0(00003)
-1-0:72.36.0(00000)
-0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
-3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
-1-0:32.7.0(220.1*V)
-1-0:52.7.0(220.2*V)
-1-0:72.7.0(220.3*V)
-1-0:31.7.0(001*A)
-1-0:51.7.0(002*A)
-1-0:71.7.0(003*A)
-1-0:21.7.0(01.111*kW)
-1-0:41.7.0(02.222*kW)
-1-0:61.7.0(03.333*kW)
-1-0:22.7.0(04.444*kW)
-1-0:42.7.0(05.555*kW)
-1-0:62.7.0(06.666*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(3232323241424344313233343536373839)
-0-1:24.2.1(101209112500W)(12785.123*m3)
-!E360
+/ISk5\2MT382-1000
+1-3:0.2.8(50)
+0-0:1.0.0(101209113020W)
+0-0:96.1.1(4B384547303034303436333935353037)
+1-0:1.8.1(123456.789*kWh)
+1-0:1.8.2(123456.789*kWh)
+1-0:2.8.1(123456.789*kWh)
+1-0:2.8.2(123456.789*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(01.193*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00004)
+0-0:96.7.9(00002)
+1-0:99.97.0(2)(0-0:96.7.19)(101208152415W)(0000000240*s)(101208151004W)(0000000301*s)
+1-0:32.32.0(00002)
+1-0:52.32.0(00001)
+1-0:72.32.0(00000)
+1-0:32.36.0(00000)
+1-0:52.36.0(00003)
+1-0:72.36.0(00000)
+0-0:96.13.0(303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C
+3D3E3F303132333435363738393A3B3C3D3E3F303132333435363738393A3B3C3D3E3F)
+1-0:32.7.0(220.1*V)
+1-0:52.7.0(220.2*V)
+1-0:72.7.0(220.3*V)
+1-0:31.7.0(001*A)
+1-0:51.7.0(002*A)
+1-0:71.7.0(003*A)
+1-0:21.7.0(01.111*kW)
+1-0:41.7.0(02.222*kW)
+1-0:61.7.0(03.333*kW)
+1-0:22.7.0(04.444*kW)
+1-0:42.7.0(05.555*kW)
+1-0:62.7.0(06.666*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(3232323241424344313233343536373839)
+0-1:24.2.1(101209112500W)(12785.123*m3)
+!E360
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/flu5.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/flu5.telegram
index d3ba113f4b878..add713ba8111f 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/flu5.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/flu5.telegram
@@ -1,23 +1,23 @@
-/FLU5\123456789_A
-
-0-0:96.1.4(50213)
-0-0:96.1.1(1234567890123456789012345678)
-0-0:1.0.0(191128000000W)
-1-0:1.8.1(000123.456kWh)
-1-0:1.8.2(000234.567kWh)
-1-0:2.8.1(000345.678kWh)
-1-0:2.8.2(000456.789kWh)
-0-0:96.14.0(0001)
-1-0:1.7.0(01.234kW)
-1-0:2.7.0(00.000kW)
-1-0:32.7.0(234.5V)
-1-0:31.7.0(005A)
-0-0:96.3.10(1)
-0-0:17.0.0(999.9kW)
-1-0:31.4.0(999A)
-0-0:96.13.0()
-0-1:24.1.0(003)
-0-1:96.1.1(1234567890123456789012345678)
-0-1:24.4.0(1)
-0-1:24.2.3(191128000000W)(00099.999*m3)
-!6EFB
+/FLU5\123456789_A
+
+0-0:96.1.4(50213)
+0-0:96.1.1(1234567890123456789012345678)
+0-0:1.0.0(191128000000W)
+1-0:1.8.1(000123.456kWh)
+1-0:1.8.2(000234.567kWh)
+1-0:2.8.1(000345.678kWh)
+1-0:2.8.2(000456.789kWh)
+0-0:96.14.0(0001)
+1-0:1.7.0(01.234kW)
+1-0:2.7.0(00.000kW)
+1-0:32.7.0(234.5V)
+1-0:31.7.0(005A)
+0-0:96.3.10(1)
+0-0:17.0.0(999.9kW)
+1-0:31.4.0(999A)
+0-0:96.13.0()
+0-1:24.1.0(003)
+0-1:96.1.1(1234567890123456789012345678)
+0-1:24.4.0(1)
+0-1:24.2.3(191128000000W)(00099.999*m3)
+!6EFB
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/smarty.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/smarty.telegram
index cec79406ede19..8d1cb350e2cc0 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/smarty.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/smarty.telegram
@@ -1,31 +1,31 @@
-/Lux5\253663629_D
-
-1-3:0.2.8(42)
-0-0:1.0.0(180130102122W)
-0-0:42.0.0(53414731303330373030313134303034)
-1-0:1.8.0(000006.695*kWh)
-1-0:2.8.0(000000.025*kWh)
-1-0:3.8.0(000000.818*kvarh)
-1-0:4.8.0(000002.745*kvarh)
-1-0:1.7.0(00.000*kW)
-1-0:2.7.0(00.000*kW)
-1-0:3.7.0(00.000)
-1-0:4.7.0(00.007)
-0-0:17.0.0(77.376)
-0-0:96.3.10(1)
-0-0:96.7.21(00069)
-1-0:32.32.0(00044)
-1-0:52.32.0(00003)
-1-0:72.32.0(00002)
-1-0:32.36.0(00000)
-1-0:52.36.0(00000)
-1-0:72.36.0(00000)
-0-0:96.13.0()
-0-0:96.13.2()
-0-0:96.13.3()
-0-0:96.13.4()
-0-0:96.13.5()
-1-0:31.7.0(000*A)
-1-0:51.7.0(000*A)
-1-0:71.7.0(000*A)
-!CFDE
+/Lux5\253663629_D
+
+1-3:0.2.8(42)
+0-0:1.0.0(180130102122W)
+0-0:42.0.0(53414731303330373030313134303034)
+1-0:1.8.0(000006.695*kWh)
+1-0:2.8.0(000000.025*kWh)
+1-0:3.8.0(000000.818*kvarh)
+1-0:4.8.0(000002.745*kvarh)
+1-0:1.7.0(00.000*kW)
+1-0:2.7.0(00.000*kW)
+1-0:3.7.0(00.000)
+1-0:4.7.0(00.007)
+0-0:17.0.0(77.376)
+0-0:96.3.10(1)
+0-0:96.7.21(00069)
+1-0:32.32.0(00044)
+1-0:52.32.0(00003)
+1-0:72.32.0(00002)
+1-0:32.36.0(00000)
+1-0:52.36.0(00000)
+1-0:72.36.0(00000)
+0-0:96.13.0()
+0-0:96.13.2()
+0-0:96.13.3()
+0-0:96.13.4()
+0-0:96.13.5()
+1-0:31.7.0(000*A)
+1-0:51.7.0(000*A)
+1-0:71.7.0(000*A)
+!CFDE
diff --git a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/unregistered_meter.telegram b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/unregistered_meter.telegram
index b022c3c1c9e91..4530d008f4cbe 100644
--- a/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/unregistered_meter.telegram
+++ b/bundles/org.openhab.binding.dsmr/src/test/resources/org/openhab/binding/dsmr/internal/unregistered_meter.telegram
@@ -1,25 +1,25 @@
-/XMX5LGBBFG1012530239
-
-1-3:0.2.8(42)
-0-0:1.0.0(161116201035W)
-0-0:96.1.1(4530303331303033323737383938383136)
-1-0:1.8.1(000075.067*kWh)
-1-0:1.8.2(000084.813*kWh)
-1-0:2.8.1(000000.000*kWh)
-1-0:2.8.2(000000.000*kWh)
-0-0:96.14.0(0002)
-1-0:1.7.0(02.778*kW)
-1-0:2.7.0(00.000*kW)
-0-0:96.7.21(00002)
-0-0:96.7.9(00000)
-1-0:99.97.0(0)(0-0:96.7.19)
-1-0:32.32.0(00000)
-1-0:32.36.0(00000)
-0-0:96.13.1()
-0-0:96.13.0()
-1-0:31.7.0(012*A)
-1-0:21.7.0(02.778*kW)
-1-0:22.7.0(00.000*kW)
-0-1:24.1.0(003)
-0-1:96.1.0(0000000000000000000000000000000000)
-!0D3D
+/XMX5LGBBFG1012530239
+
+1-3:0.2.8(42)
+0-0:1.0.0(161116201035W)
+0-0:96.1.1(4530303331303033323737383938383136)
+1-0:1.8.1(000075.067*kWh)
+1-0:1.8.2(000084.813*kWh)
+1-0:2.8.1(000000.000*kWh)
+1-0:2.8.2(000000.000*kWh)
+0-0:96.14.0(0002)
+1-0:1.7.0(02.778*kW)
+1-0:2.7.0(00.000*kW)
+0-0:96.7.21(00002)
+0-0:96.7.9(00000)
+1-0:99.97.0(0)(0-0:96.7.19)
+1-0:32.32.0(00000)
+1-0:32.36.0(00000)
+0-0:96.13.1()
+0-0:96.13.0()
+1-0:31.7.0(012*A)
+1-0:21.7.0(02.778*kW)
+1-0:22.7.0(00.000*kW)
+0-1:24.1.0(003)
+0-1:96.1.0(0000000000000000000000000000000000)
+!0D3D