diff --git a/test/test-frames/EFE_Engelmann-WaterStar.xml b/test/test-frames/EFE_Engelmann-WaterStar.xml
index 278bbc16..2c4a5363 100644
--- a/test/test-frames/EFE_Engelmann-WaterStar.xml
+++ b/test/test-frames/EFE_Engelmann-WaterStar.xml
@@ -6,7 +6,7 @@
         <Manufacturer>EFE</Manufacturer>
         <Version>0</Version>
         <ProductName>Engelmann WaterStar</ProductName>
-        <Medium>Hot water</Medium>
+        <Medium>Warm water (30-90°C)</Medium>
         <AccessNumber>12</AccessNumber>
         <Status>27</Status>
         <Signature>0000</Signature>
diff --git a/test/test-frames/ELS_Elster-F96-Plus.xml b/test/test-frames/ELS_Elster-F96-Plus.xml
index 41b3e1f9..1bcedc83 100644
--- a/test/test-frames/ELS_Elster-F96-Plus.xml
+++ b/test/test-frames/ELS_Elster-F96-Plus.xml
@@ -48,14 +48,14 @@
         <Function>Value during error state</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Power (W)</Unit>
-        <Value>144445223</Value>
+        <Value>DDDDEBBD</Value>
     </DataRecord>
 
     <DataRecord id="5">
         <Function>Value during error state</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Volume flow (m m^3/h)</Unit>
-        <Value>1445223</Value>
+        <Value>DDEBBD</Value>
     </DataRecord>
 
     <DataRecord id="6">
diff --git a/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.xml b/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.xml
index 05020492..c2492218 100644
--- a/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.xml
+++ b/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.xml
@@ -58,7 +58,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Temperature Difference (1e-2  deg C)</Unit>
-        <Value>1500018</Value>
+        <Value>F00018</Value>
     </DataRecord>
 
     <DataRecord id="7">
diff --git a/test/test-frames/abb_f95.xml b/test/test-frames/abb_f95.xml
index 4ddaadf9..2b14a587 100644
--- a/test/test-frames/abb_f95.xml
+++ b/test/test-frames/abb_f95.xml
@@ -30,14 +30,14 @@
         <Function>Value during error state</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Power (1e-1 W)</Unit>
-        <Value>144521543</Value>
+        <Value>DDEBB4DD</Value>
     </DataRecord>
 
     <DataRecord id="3">
         <Function>Value during error state</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Volume flow (1e-4  m^3/h)</Unit>
-        <Value>1521543</Value>
+        <Value>EBB4DD</Value>
     </DataRecord>
 
     <DataRecord id="4">
diff --git a/test/test-frames/electricity-meter-1.xml b/test/test-frames/electricity-meter-1.xml
index 5a32f2ef..98069b99 100644
--- a/test/test-frames/electricity-meter-1.xml
+++ b/test/test-frames/electricity-meter-1.xml
@@ -2,7 +2,7 @@
 <MBusData>
 
     <SlaveInformation>
-        <Id>5000244</Id>
+        <Id>500023E</Id>
         <Manufacturer>SBC</Manufacturer>
         <Version>18</Version>
         <ProductName></ProductName>
diff --git a/test/test-frames/electricity-meter-2.xml b/test/test-frames/electricity-meter-2.xml
index d5a1c478..810c9c1a 100644
--- a/test/test-frames/electricity-meter-2.xml
+++ b/test/test-frames/electricity-meter-2.xml
@@ -2,7 +2,7 @@
 <MBusData>
 
     <SlaveInformation>
-        <Id>5000345</Id>
+        <Id>50002E5</Id>
         <Manufacturer>@@@</Manufacturer>
         <Version>18</Version>
         <ProductName></ProductName>
diff --git a/test/test-frames/landis+gyr_ultraheat_t230.xml b/test/test-frames/landis+gyr_ultraheat_t230.xml
index 1bd0ef3a..ea3a8791 100644
--- a/test/test-frames/landis+gyr_ultraheat_t230.xml
+++ b/test/test-frames/landis+gyr_ultraheat_t230.xml
@@ -72,7 +72,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>Temperature Difference (1e-1  deg C)</Unit>
-        <Value>1500002</Value>
+        <Value>F00002</Value>
     </DataRecord>
 
     <DataRecord id="9">
diff --git a/test/test-frames/siemens_water.xml b/test/test-frames/siemens_water.xml
index a8ec54af..8cc6c65a 100644
--- a/test/test-frames/siemens_water.xml
+++ b/test/test-frames/siemens_water.xml
@@ -6,7 +6,7 @@
         <Manufacturer>LSE</Manufacturer>
         <Version>153</Version>
         <ProductName>Siemens WFH21</ProductName>
-        <Medium>Hot water</Medium>
+        <Medium>Warm water (30-90°C)</Medium>
         <AccessNumber>235</AccessNumber>
         <Status>00</Status>
         <Signature>0000</Signature>
diff --git a/test/test-frames/siemens_wfh21.xml b/test/test-frames/siemens_wfh21.xml
index 8f3b7901..7bff369f 100644
--- a/test/test-frames/siemens_wfh21.xml
+++ b/test/test-frames/siemens_wfh21.xml
@@ -6,7 +6,7 @@
         <Manufacturer>LSE</Manufacturer>
         <Version>153</Version>
         <ProductName>Siemens WFH21</ProductName>
-        <Medium>Hot water</Medium>
+        <Medium>Warm water (30-90°C)</Medium>
         <AccessNumber>218</AccessNumber>
         <Status>00</Status>
         <Signature>0000</Signature>