From 05134e7e608111455ce64dfe9293cd7bffcd686a Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 23 Apr 2018 22:38:30 +0200
Subject: [PATCH 01/29] try offering FCB function

---
 mbus/mbus-protocol-aux.c | 36 ++++++++++++++++++++++++++++++++++++
 mbus/mbus-protocol-aux.h |  5 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index 8877d62c..ff3ed572 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -1930,6 +1930,42 @@ mbus_send_request_frame(mbus_handle * handle, int address)
     return retval;
 }
 
+//------------------------------------------------------------------------------
+// send a request packet to from master to slave
+//------------------------------------------------------------------------------
+int
+mbus_send_request_frame_fcb(mbus_handle * handle, int address)
+{
+    int retval = 0;
+    mbus_frame *frame;
+
+    if (mbus_is_primary_address(address) == 0)
+    {
+        MBUS_ERROR("%s: invalid address %d\n", __PRETTY_FUNCTION__, address);
+        return -1;
+    }
+
+    frame = mbus_frame_new(MBUS_FRAME_TYPE_SHORT);
+
+    if (frame == NULL)
+    {
+        MBUS_ERROR("%s: failed to allocate mbus frame.\n", __PRETTY_FUNCTION__);
+        return -1;
+    }
+
+    frame->control = MBUS_CONTROL_MASK_REQ_UD2 | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB;
+    frame->address = address;
+
+    if (mbus_send_frame(handle, frame) == -1)
+    {
+        MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
+        retval = -1;
+    }
+
+    mbus_frame_free(frame);
+    return retval;
+}
+
 //------------------------------------------------------------------------------
 // send a user data packet from master to slave
 //------------------------------------------------------------------------------
diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h
index 4dacef4c..143c7eee 100755
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@@ -97,7 +97,7 @@ typedef struct _mbus_handle {
     void (*recv_event) (unsigned char src_type, const char *buff, size_t len);
     void (*send_event) (unsigned char src_type, const char *buff, size_t len);
     void (*scan_progress) (struct _mbus_handle *handle, const char *mask);
-    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);    
+    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);
     void *auxdata;
 } mbus_handle;
 
@@ -293,7 +293,8 @@ int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baud
  *
  * @return Zero when successful.
  */
-int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame_fcb(mbus_handle * handle, int address);
 
 /**
  * Sends user data frame (SND_UD) to given slave using "unified" handle

From 075ae5cdd15a633835990d4f89074f6b5dd9437e Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 23 Apr 2018 22:38:30 +0200
Subject: [PATCH 02/29] try offering FCB function

---
 mbus/mbus-protocol-aux.c | 36 ++++++++++++++++++++++++++++++++++++
 mbus/mbus-protocol-aux.h |  5 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index 8877d62c..ff3ed572 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -1930,6 +1930,42 @@ mbus_send_request_frame(mbus_handle * handle, int address)
     return retval;
 }
 
+//------------------------------------------------------------------------------
+// send a request packet to from master to slave
+//------------------------------------------------------------------------------
+int
+mbus_send_request_frame_fcb(mbus_handle * handle, int address)
+{
+    int retval = 0;
+    mbus_frame *frame;
+
+    if (mbus_is_primary_address(address) == 0)
+    {
+        MBUS_ERROR("%s: invalid address %d\n", __PRETTY_FUNCTION__, address);
+        return -1;
+    }
+
+    frame = mbus_frame_new(MBUS_FRAME_TYPE_SHORT);
+
+    if (frame == NULL)
+    {
+        MBUS_ERROR("%s: failed to allocate mbus frame.\n", __PRETTY_FUNCTION__);
+        return -1;
+    }
+
+    frame->control = MBUS_CONTROL_MASK_REQ_UD2 | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB;
+    frame->address = address;
+
+    if (mbus_send_frame(handle, frame) == -1)
+    {
+        MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
+        retval = -1;
+    }
+
+    mbus_frame_free(frame);
+    return retval;
+}
+
 //------------------------------------------------------------------------------
 // send a user data packet from master to slave
 //------------------------------------------------------------------------------
diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h
index 4dacef4c..143c7eee 100755
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@@ -97,7 +97,7 @@ typedef struct _mbus_handle {
     void (*recv_event) (unsigned char src_type, const char *buff, size_t len);
     void (*send_event) (unsigned char src_type, const char *buff, size_t len);
     void (*scan_progress) (struct _mbus_handle *handle, const char *mask);
-    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);    
+    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);
     void *auxdata;
 } mbus_handle;
 
@@ -293,7 +293,8 @@ int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baud
  *
  * @return Zero when successful.
  */
-int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame_fcb(mbus_handle * handle, int address);
 
 /**
  * Sends user data frame (SND_UD) to given slave using "unified" handle

From 324b2420f94b5646964299c4c78a86b81f7c0a4b Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 23 Apr 2018 22:38:30 +0200
Subject: [PATCH 03/29] try offering FCB function

---
 mbus/mbus-protocol-aux.c | 36 ++++++++++++++++++++++++++++++++++++
 mbus/mbus-protocol-aux.h |  5 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index 5ddba9fb..c932f7e1 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -1924,6 +1924,42 @@ mbus_send_request_frame(mbus_handle * handle, int address)
     return retval;
 }
 
+//------------------------------------------------------------------------------
+// send a request packet to from master to slave
+//------------------------------------------------------------------------------
+int
+mbus_send_request_frame_fcb(mbus_handle * handle, int address)
+{
+    int retval = 0;
+    mbus_frame *frame;
+
+    if (mbus_is_primary_address(address) == 0)
+    {
+        MBUS_ERROR("%s: invalid address %d\n", __PRETTY_FUNCTION__, address);
+        return -1;
+    }
+
+    frame = mbus_frame_new(MBUS_FRAME_TYPE_SHORT);
+
+    if (frame == NULL)
+    {
+        MBUS_ERROR("%s: failed to allocate mbus frame.\n", __PRETTY_FUNCTION__);
+        return -1;
+    }
+
+    frame->control = MBUS_CONTROL_MASK_REQ_UD2 | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB;
+    frame->address = address;
+
+    if (mbus_send_frame(handle, frame) == -1)
+    {
+        MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
+        retval = -1;
+    }
+
+    mbus_frame_free(frame);
+    return retval;
+}
+
 //------------------------------------------------------------------------------
 // send a user data packet from master to slave
 //------------------------------------------------------------------------------
diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h
index 4dacef4c..143c7eee 100755
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@@ -97,7 +97,7 @@ typedef struct _mbus_handle {
     void (*recv_event) (unsigned char src_type, const char *buff, size_t len);
     void (*send_event) (unsigned char src_type, const char *buff, size_t len);
     void (*scan_progress) (struct _mbus_handle *handle, const char *mask);
-    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);    
+    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);
     void *auxdata;
 } mbus_handle;
 
@@ -293,7 +293,8 @@ int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baud
  *
  * @return Zero when successful.
  */
-int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame_fcb(mbus_handle * handle, int address);
 
 /**
  * Sends user data frame (SND_UD) to given slave using "unified" handle

From 37225059e29cef4c7c92e1cdd6b929816f62f644 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Mon, 6 Jul 2020 12:06:39 +0200
Subject: [PATCH 04/29] Also generate normalized XML

In order to increase the test coverage also generate the normalized version
of XML output.
---
 test/generate-xml.sh | 52 ++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/test/generate-xml.sh b/test/generate-xml.sh
index 6a3231ff..b9662d93 100755
--- a/test/generate-xml.sh
+++ b/test/generate-xml.sh
@@ -37,51 +37,71 @@ if [ $# -eq 2 ]; then
 fi
 
 # Check if mbus_parse_hex exists
-if [ ! -x $mbus_parse_hex ]; then
+if [ ! -x "$mbus_parse_hex" ]; then
     echo "mbus_parse_hex not found"
     echo "path to mbus_parse_hex: $mbus_parse_hex"
     exit 3
 fi
 
-for hexfile in "$directory"/*.hex;  do
-    if [ ! -f "$hexfile" ]; then
-        continue
-    fi
+generate_xml() {
+    directory="$1"
+    hexfile="$2"
+    mode="$3"
 
-    filename=`basename $hexfile .hex`
+    filename=$(basename "$hexfile" .hex)
+
+    if [ "$mode" = "normalized" ]; then
+        options="-n"
+        mode=".norm"
+    else
+        options=""
+	mode=""
+    fi
 
     # Parse hex file and write XML in file
-    $mbus_parse_hex "$hexfile" > "$directory/$filename.xml.new"
+    "$mbus_parse_hex" $options "$hexfile" > "$directory/$filename$mode.xml.new"
     result=$?
 
     # Check parsing result
     if [ $result -ne 0 ]; then
         echo "Unable to generate XML for $hexfile"
-        rm "$directory/$filename.xml.new"
-        continue
+        rm "$directory/$filename$mode.xml.new"
+        return 1
     fi
 
     # Compare old XML with new XML and write in file
-    diff -u "$directory/$filename.xml" "$directory/$filename.xml.new" 2> /dev/null > "$directory/$filename.dif"
+    diff -u "$directory/$filename$mode.xml" "$directory/$filename$mode.xml.new" 2> /dev/null > "$directory/$filename$mode.dif"
     result=$?
 
     case "$result" in
         0)
              # XML equal -> remove new
-             rm "$directory/$filename.xml.new"
-             rm "$directory/$filename.dif"
+             rm "$directory/$filename$mode.xml.new"
+             rm "$directory/$filename$mode.dif"
              ;;
         1)
              # different -> print diff
-             cat "$directory/$filename.dif" && rm "$directory/$filename.dif"
+             cat "$directory/$filename$mode.dif" && rm "$directory/$filename$mode.dif"
              echo ""
              ;;
         *)
              # no old -> rename XML
-             echo "Create $filename.xml"
-             mv "$directory/$filename.xml.new" "$directory/$filename.xml"
-             rm "$directory/$filename.dif"
+             echo "Create $filename$mode.xml"
+             mv "$directory/$filename$mode.xml.new" "$directory/$filename$mode.xml"
+             rm "$directory/$filename$mode.dif"
              ;;
     esac
+
+    return $result
+}
+
+for hexfile in "$directory"/*.hex;  do
+    if [ ! -f "$hexfile" ]; then
+        continue
+    fi
+
+    generate_xml "$directory" "$hexfile" "default"
+
+    generate_xml "$directory" "$hexfile" "normalized"
 done
 

From 581a8d187827b7308708d3f2838a34d3afdb8c81 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Mon, 6 Jul 2020 12:55:05 +0200
Subject: [PATCH 05/29] Add normalized XML files of test frames

---
 test/test-frames/ACW_Itron-BM-plus-m.norm.xml |  87 ++++
 .../ACW_Itron-CYBLE-M-Bus-14.norm.xml         |  79 ++++
 test/test-frames/EDC.norm.xml                 | 231 +++++++++++
 .../EFE_Engelmann-Elster-SensoStar-2.norm.xml | 229 +++++++++++
 .../EFE_Engelmann-WaterStar.norm.xml          | 113 ++++++
 test/test-frames/ELS_Elster-F96-Plus.norm.xml | 151 +++++++
 test/test-frames/ELV-Elvaco-CMa10.norm.xml    | 121 ++++++
 .../EMU_EMU-Professional-375-M-Bus.norm.xml   | 287 +++++++++++++
 test/test-frames/Elster-F2.norm.xml           | 133 ++++++
 .../FIN-Finder-7E.23.8.230.0020.norm.xml      |  69 ++++
 test/test-frames/GWF-MTKcoder.norm.xml        |  31 ++
 test/test-frames/LGB_G350.norm.xml            |  65 +++
 test/test-frames/REL-Relay-Padpuls2.norm.xml  |  63 +++
 .../SBC_Saia-Burgess-ALE3.norm.xml            | 191 +++++++++
 test/test-frames/SEN_Pollustat.norm.xml       | 143 +++++++
 .../SEN_Sensus-PolluStat-E.norm.xml           |  95 +++++
 .../SEN_Sensus-PolluTherm.norm.xml            |  87 ++++
 .../SLB_CF-Compact-Integral-MK-MaXX.norm.xml  | 139 +++++++
 test/test-frames/THI_cma10.norm.xml           | 121 ++++++
 .../test-frames/ZRM_Minol-Minocal-C2.norm.xml | 335 ++++++++++++++++
 test/test-frames/abb_delta.norm.xml           | 153 +++++++
 test/test-frames/abb_f95.norm.xml             | 131 ++++++
 test/test-frames/allmess_cf50.norm.xml        |  95 +++++
 test/test-frames/berg_dz_plus.norm.xml        | 169 ++++++++
 test/test-frames/electricity-meter-1.norm.xml | 191 +++++++++
 test/test-frames/electricity-meter-2.norm.xml | 191 +++++++++
 test/test-frames/els_falcon.norm.xml          |  87 ++++
 test/test-frames/els_tmpa_telegramm1.norm.xml |  63 +++
 test/test-frames/elv_temp_humid.norm.xml      | 121 ++++++
 test/test-frames/emh_diz.norm.xml             |  43 ++
 .../engelmann_sensostar2c.norm.xml            | 225 +++++++++++
 test/test-frames/example_data_01.norm.xml     |  63 +++
 test/test-frames/example_data_02.norm.xml     |  63 +++
 test/test-frames/filler.norm.xml              |  23 ++
 test/test-frames/frame1.norm.xml              |  23 ++
 test/test-frames/frame2.norm.xml              |  43 ++
 test/test-frames/gmc_emmod206.norm.xml        | 215 ++++++++++
 test/test-frames/itron_bm_+m.norm.xml         |  87 ++++
 test/test-frames/itron_cf_51.norm.xml         | 147 +++++++
 test/test-frames/itron_cf_55.norm.xml         | 119 ++++++
 test/test-frames/itron_cf_echo_2.norm.xml     | 119 ++++++
 ...itron_cyble_m-bus_v1.4_cold_water.norm.xml |  79 ++++
 .../itron_cyble_m-bus_v1.4_gas.norm.xml       |  79 ++++
 .../itron_cyble_m-bus_v1.4_water.norm.xml     |  79 ++++
 .../itron_integral_mk_maxx.norm.xml           | 139 +++++++
 test/test-frames/kamstrup_382_005.norm.xml    |  75 ++++
 .../kamstrup_multical_601.norm.xml            | 259 ++++++++++++
 .../landis+gyr_ultraheat_t230.norm.xml        | 327 +++++++++++++++
 test/test-frames/manual_frame2.norm.xml       |  23 ++
 test/test-frames/manual_frame3.norm.xml       |  43 ++
 test/test-frames/manual_frame7.norm.xml       |  23 ++
 test/test-frames/metrona_pollutherm.norm.xml  |  95 +++++
 .../test-frames/metrona_ultraheat_xs.norm.xml | 379 ++++++++++++++++++
 test/test-frames/minol_minocal_c2.norm.xml    | 335 ++++++++++++++++
 test/test-frames/minol_minocal_wr3.norm.xml   | 285 +++++++++++++
 test/test-frames/nzr_dhz_5_63.norm.xml        |  71 ++++
 test/test-frames/oms_frame1.norm.xml          |  39 ++
 test/test-frames/oms_frame2.norm.xml          |  55 +++
 test/test-frames/oms_frame3.norm.xml          |  87 ++++
 test/test-frames/ram_modularis.norm.xml       | 311 ++++++++++++++
 test/test-frames/rel_padpuls2.norm.xml        |  63 +++
 test/test-frames/rel_padpuls3.norm.xml        |  63 +++
 test/test-frames/sen_pollusonic_2.norm.xml    |  23 ++
 test/test-frames/sen_pollutherm.norm.xml      |  90 +++++
 test/test-frames/siemens_water.norm.xml       |  95 +++++
 test/test-frames/siemens_wfh21.norm.xml       | 103 +++++
 .../sontex_supercal_531_telegram1.norm.xml    | 111 +++++
 test/test-frames/svm_f22_telegram1.norm.xml   | 133 ++++++
 test/test-frames/tch_telegramm1.norm.xml      |  95 +++++
 test/test-frames/wmbus-converted.norm.xml     |  23 ++
 70 files changed, 8723 insertions(+)
 create mode 100644 test/test-frames/ACW_Itron-BM-plus-m.norm.xml
 create mode 100644 test/test-frames/ACW_Itron-CYBLE-M-Bus-14.norm.xml
 create mode 100644 test/test-frames/EDC.norm.xml
 create mode 100644 test/test-frames/EFE_Engelmann-Elster-SensoStar-2.norm.xml
 create mode 100644 test/test-frames/EFE_Engelmann-WaterStar.norm.xml
 create mode 100644 test/test-frames/ELS_Elster-F96-Plus.norm.xml
 create mode 100644 test/test-frames/ELV-Elvaco-CMa10.norm.xml
 create mode 100644 test/test-frames/EMU_EMU-Professional-375-M-Bus.norm.xml
 create mode 100644 test/test-frames/Elster-F2.norm.xml
 create mode 100644 test/test-frames/FIN-Finder-7E.23.8.230.0020.norm.xml
 create mode 100644 test/test-frames/GWF-MTKcoder.norm.xml
 create mode 100644 test/test-frames/LGB_G350.norm.xml
 create mode 100644 test/test-frames/REL-Relay-Padpuls2.norm.xml
 create mode 100644 test/test-frames/SBC_Saia-Burgess-ALE3.norm.xml
 create mode 100644 test/test-frames/SEN_Pollustat.norm.xml
 create mode 100644 test/test-frames/SEN_Sensus-PolluStat-E.norm.xml
 create mode 100644 test/test-frames/SEN_Sensus-PolluTherm.norm.xml
 create mode 100644 test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.norm.xml
 create mode 100644 test/test-frames/THI_cma10.norm.xml
 create mode 100644 test/test-frames/ZRM_Minol-Minocal-C2.norm.xml
 create mode 100644 test/test-frames/abb_delta.norm.xml
 create mode 100644 test/test-frames/abb_f95.norm.xml
 create mode 100644 test/test-frames/allmess_cf50.norm.xml
 create mode 100644 test/test-frames/berg_dz_plus.norm.xml
 create mode 100644 test/test-frames/electricity-meter-1.norm.xml
 create mode 100644 test/test-frames/electricity-meter-2.norm.xml
 create mode 100644 test/test-frames/els_falcon.norm.xml
 create mode 100644 test/test-frames/els_tmpa_telegramm1.norm.xml
 create mode 100644 test/test-frames/elv_temp_humid.norm.xml
 create mode 100644 test/test-frames/emh_diz.norm.xml
 create mode 100644 test/test-frames/engelmann_sensostar2c.norm.xml
 create mode 100644 test/test-frames/example_data_01.norm.xml
 create mode 100644 test/test-frames/example_data_02.norm.xml
 create mode 100644 test/test-frames/filler.norm.xml
 create mode 100644 test/test-frames/frame1.norm.xml
 create mode 100644 test/test-frames/frame2.norm.xml
 create mode 100644 test/test-frames/gmc_emmod206.norm.xml
 create mode 100644 test/test-frames/itron_bm_+m.norm.xml
 create mode 100644 test/test-frames/itron_cf_51.norm.xml
 create mode 100644 test/test-frames/itron_cf_55.norm.xml
 create mode 100644 test/test-frames/itron_cf_echo_2.norm.xml
 create mode 100644 test/test-frames/itron_cyble_m-bus_v1.4_cold_water.norm.xml
 create mode 100644 test/test-frames/itron_cyble_m-bus_v1.4_gas.norm.xml
 create mode 100644 test/test-frames/itron_cyble_m-bus_v1.4_water.norm.xml
 create mode 100644 test/test-frames/itron_integral_mk_maxx.norm.xml
 create mode 100644 test/test-frames/kamstrup_382_005.norm.xml
 create mode 100644 test/test-frames/kamstrup_multical_601.norm.xml
 create mode 100644 test/test-frames/landis+gyr_ultraheat_t230.norm.xml
 create mode 100644 test/test-frames/manual_frame2.norm.xml
 create mode 100644 test/test-frames/manual_frame3.norm.xml
 create mode 100644 test/test-frames/manual_frame7.norm.xml
 create mode 100644 test/test-frames/metrona_pollutherm.norm.xml
 create mode 100644 test/test-frames/metrona_ultraheat_xs.norm.xml
 create mode 100644 test/test-frames/minol_minocal_c2.norm.xml
 create mode 100644 test/test-frames/minol_minocal_wr3.norm.xml
 create mode 100644 test/test-frames/nzr_dhz_5_63.norm.xml
 create mode 100644 test/test-frames/oms_frame1.norm.xml
 create mode 100644 test/test-frames/oms_frame2.norm.xml
 create mode 100644 test/test-frames/oms_frame3.norm.xml
 create mode 100644 test/test-frames/ram_modularis.norm.xml
 create mode 100644 test/test-frames/rel_padpuls2.norm.xml
 create mode 100644 test/test-frames/rel_padpuls3.norm.xml
 create mode 100644 test/test-frames/sen_pollusonic_2.norm.xml
 create mode 100644 test/test-frames/sen_pollutherm.norm.xml
 create mode 100644 test/test-frames/siemens_water.norm.xml
 create mode 100644 test/test-frames/siemens_wfh21.norm.xml
 create mode 100644 test/test-frames/sontex_supercal_531_telegram1.norm.xml
 create mode 100644 test/test-frames/svm_f22_telegram1.norm.xml
 create mode 100644 test/test-frames/tch_telegramm1.norm.xml
 create mode 100644 test/test-frames/wmbus-converted.norm.xml

diff --git a/test/test-frames/ACW_Itron-BM-plus-m.norm.xml b/test/test-frames/ACW_Itron-BM-plus-m.norm.xml
new file mode 100644
index 00000000..fead0d15
--- /dev/null
+++ b/test/test-frames/ACW_Itron-BM-plus-m.norm.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11490378</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>14</Version>
+        <ProductName>Itron BM +m</ProductName>
+        <Medium>Cold water</Medium>
+        <AccessNumber>10</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11490378.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>54.321000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-00-00</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T11:11:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>6.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 01 75 13</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/ACW_Itron-CYBLE-M-Bus-14.norm.xml b/test/test-frames/ACW_Itron-CYBLE-M-Bus-14.norm.xml
new file mode 100644
index 00000000..943c741d
--- /dev/null
+++ b/test/test-frames/ACW_Itron-CYBLE-M-Bus-14.norm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>9011523</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>20</Version>
+        <ProductName>Itron CYBLE M-Bus 1.4</ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>37</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>9011523.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>cust. ID</Quantity>
+        <Value>09LA076755</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T14:26:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>bat. time</Quantity>
+        <Value>2516.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.031000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.031000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 01 1F</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/EDC.norm.xml b/test/test-frames/EDC.norm.xml
new file mode 100644
index 00000000..c43be60c
--- /dev/null
+++ b/test/test-frames/EDC.norm.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11120895</Id>
+        <Manufacturer>EDC</Manufacturer>
+        <Version>2</Version>
+        <ProductName></ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>23</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>35000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>465000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>21.536703</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>21.605042</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>92.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>92.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000707</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.357622</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>18511.912109</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-07-10T15:25:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>C</Quantity>
+        <Value>3571.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>-</Unit>
+        <Quantity>C</Quantity>
+        <Value>413.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>c</Quantity>
+        <Value>1.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>-</Unit>
+        <Quantity>c</Quantity>
+        <Value>1.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/EFE_Engelmann-Elster-SensoStar-2.norm.xml b/test/test-frames/EFE_Engelmann-Elster-SensoStar-2.norm.xml
new file mode 100644
index 00000000..95229632
--- /dev/null
+++ b/test/test-frames/EFE_Engelmann-Elster-SensoStar-2.norm.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>24083345</Id>
+        <Manufacturer>EFE</Manufacturer>
+        <Version>0</Version>
+        <ProductName>Engelmann / Elster SensoStar 2</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>102</AccessNumber>
+        <Status>27</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>24083345.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-12T14:23:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.025000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>11.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>22.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>21.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.090000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>45273600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000011</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/EFE_Engelmann-WaterStar.norm.xml b/test/test-frames/EFE_Engelmann-WaterStar.norm.xml
new file mode 100644
index 00000000..c0e11e42
--- /dev/null
+++ b/test/test-frames/EFE_Engelmann-WaterStar.norm.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>4990254</Id>
+        <Manufacturer>EFE</Manufacturer>
+        <Version>0</Version>
+        <ProductName>Engelmann WaterStar</ProductName>
+        <Medium>Warm water (30-90°C)</Medium>
+        <AccessNumber>12</AccessNumber>
+        <Status>27</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>4990254.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T12:10:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.332000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.331000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.332000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>2.070000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>102902400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000008</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/ELS_Elster-F96-Plus.norm.xml b/test/test-frames/ELS_Elster-F96-Plus.norm.xml
new file mode 100644
index 00000000..e2407b37
--- /dev/null
+++ b/test/test-frames/ELS_Elster-F96-Plus.norm.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>44493951</Id>
+        <Manufacturer>ELS</Manufacturer>
+        <Version>47</Version>
+        <ProductName>Elster F96 Plus</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>161</AccessNumber>
+        <Status>70</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>13131113.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>131.113000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>22.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>22.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>63072000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T13:09:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-05-31</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/ELV-Elvaco-CMa10.norm.xml b/test/test-frames/ELV-Elvaco-CMa10.norm.xml
new file mode 100644
index 00000000..13a95962
--- /dev/null
+++ b/test/test-frames/ELV-Elvaco-CMa10.norm.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>24011561</Id>
+        <Manufacturer>ELV</Manufacturer>
+        <Version>22</Version>
+        <ProductName>Elvaco CMa10</ProductName>
+        <Medium>Other</Medium>
+        <AccessNumber>63</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Digital Input</Quantity>
+        <Value>2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>54.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>33.640000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>73.630000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>20.940000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>13.720000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>29.780000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>86400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>20.920000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>20.790000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>24011561.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>262144.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/EMU_EMU-Professional-375-M-Bus.norm.xml b/test/test-frames/EMU_EMU-Professional-375-M-Bus.norm.xml
new file mode 100644
index 00000000..e1d3388b
--- /dev/null
+++ b/test/test-frames/EMU_EMU-Professional-375-M-Bus.norm.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>32629</Id>
+        <Manufacturer>EMU</Manufacturer>
+        <Version>16</Version>
+        <ProductName>EMU Professional 3/75 M-Bus</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>2</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>32629.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1364.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>7854.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>14.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>14.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>225.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>187.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>241.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>-0.066000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>-0.066000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>13.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>500.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Reset counter</Quantity>
+        <Value>56.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="31">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/Elster-F2.norm.xml b/test/test-frames/Elster-F2.norm.xml
new file mode 100644
index 00000000..c8fdec54
--- /dev/null
+++ b/test/test-frames/Elster-F2.norm.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>802657</Id>
+        <Manufacturer>SVM</Manufacturer>
+        <Version>8</Version>
+        <ProductName>Elster F2 / Deltamess F2</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>70</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>5272000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1204.270000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>917.690000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>28.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>34.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>149014800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>149014800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2013-06-29T12:12:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>C4 09 01 01 12 00 01 01 01 07 57 26 80 00 CD 4E 08 04 07 A3 FF 03 57 26 80 00 04 04 0D 02 FF 0F 05 3C FF 62 E7 62 96 0A 89 0A 02 00 15 40 17 01 00 00 63 42</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/FIN-Finder-7E.23.8.230.0020.norm.xml b/test/test-frames/FIN-Finder-7E.23.8.230.0020.norm.xml
new file mode 100644
index 00000000..118a1f5c
--- /dev/null
+++ b/test/test-frames/FIN-Finder-7E.23.8.230.0020.norm.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>23006207</Id>
+        <Manufacturer>FIN</Manufacturer>
+        <Version>35</Version>
+        <ProductName></ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>146</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1728680.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1728680.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>230.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>90.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-30.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/GWF-MTKcoder.norm.xml b/test/test-frames/GWF-MTKcoder.norm.xml
new file mode 100644
index 00000000..6cadee12
--- /dev/null
+++ b/test/test-frames/GWF-MTKcoder.norm.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>182007</Id>
+        <Manufacturer>GWF</Manufacturer>
+        <Version>53</Version>
+        <ProductName></ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>76</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>182007.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>269.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/LGB_G350.norm.xml b/test/test-frames/LGB_G350.norm.xml
new file mode 100644
index 00000000..acc91446
--- /dev/null
+++ b/test/test-frames/LGB_G350.norm.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12082058</Id>
+        <Manufacturer>LGB</Manufacturer>
+        <Version>64</Version>
+        <ProductName></ProductName>
+        <Medium>Gas</Medium>
+        <AccessNumber>64</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>10834.092000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2016-07-22T08:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>G0017591208205814</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit></Unit>
+        <Quantity>Digital Output</Quantity>
+        <Value>1.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Special supplier information</Quantity>
+        <Value>15.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/REL-Relay-Padpuls2.norm.xml b/test/test-frames/REL-Relay-Padpuls2.norm.xml
new file mode 100644
index 00000000..b5b14405
--- /dev/null
+++ b/test/test-frames/REL-Relay-Padpuls2.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11216301</Id>
+        <Manufacturer>REL</Manufacturer>
+        <Version>65</Version>
+        <ProductName></ProductName>
+        <Medium>Gas</Medium>
+        <AccessNumber>177</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>28760.810000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>1900-01-00T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>25973.820000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2015-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>C0 01 01 0C</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/SBC_Saia-Burgess-ALE3.norm.xml b/test/test-frames/SBC_Saia-Burgess-ALE3.norm.xml
new file mode 100644
index 00000000..cc646d79
--- /dev/null
+++ b/test/test-frames/SBC_Saia-Burgess-ALE3.norm.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>19000055</Id>
+        <Manufacturer>SBC</Manufacturer>
+        <Version>22</Version>
+        <ProductName>Saia-Burgess ALE3</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>191</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>2930.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>2930.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>60.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>60.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>223.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/SEN_Pollustat.norm.xml b/test/test-frames/SEN_Pollustat.norm.xml
new file mode 100644
index 00000000..a69a6eec
--- /dev/null
+++ b/test/test-frames/SEN_Pollustat.norm.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11788</Id>
+        <Manufacturer>SEN</Manufacturer>
+        <Version>6</Version>
+        <ProductName></ProductName>
+        <Medium>Heat / Cooling load meter</Medium>
+        <AccessNumber>62</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2015-04-07T14:59:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2000-01-01T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>67108864.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>15803026.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>15145636.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>39831000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>6162.878000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-170.721784</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>3.230039</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>31.147324</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>31.193100</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>-0.045776</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>11582321.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>756.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11788.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>-19184.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/SEN_Sensus-PolluStat-E.norm.xml b/test/test-frames/SEN_Sensus-PolluStat-E.norm.xml
new file mode 100644
index 00000000..e0ac268c
--- /dev/null
+++ b/test/test-frames/SEN_Sensus-PolluStat-E.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>21265095</Id>
+        <Manufacturer>SEN</Manufacturer>
+        <Version>14</Version>
+        <ProductName>Sensus PolluStat E</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>181</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>20.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>20.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>21265095.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Customer location</Quantity>
+        <Value>21265095.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/SEN_Sensus-PolluTherm.norm.xml b/test/test-frames/SEN_Sensus-PolluTherm.norm.xml
new file mode 100644
index 00000000..c46e40da
--- /dev/null
+++ b/test/test-frames/SEN_Sensus-PolluTherm.norm.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>24351689</Id>
+        <Manufacturer>SEN</Manufacturer>
+        <Version>11</Version>
+        <ProductName>Sensus PolluTherm</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>84</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>24351689.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Customer location</Quantity>
+        <Value>24351689.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.norm.xml b/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.norm.xml
new file mode 100644
index 00000000..a5e4a4a8
--- /dev/null
+++ b/test/test-frames/SLB_CF-Compact-Integral-MK-MaXX.norm.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11817314</Id>
+        <Manufacturer>SLB</Manufacturer>
+        <Version>6</Version>
+        <ProductName>CF Compact / Integral MK MaXX</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>3</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11817314.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.020000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>21.800000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>22.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>-0.180000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>101606400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T14:02:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1.230000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>3.210000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>3.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>18.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 16</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/THI_cma10.norm.xml b/test/test-frames/THI_cma10.norm.xml
new file mode 100644
index 00000000..86e149a6
--- /dev/null
+++ b/test/test-frames/THI_cma10.norm.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>2</Id>
+        <Manufacturer>ELV</Manufacturer>
+        <Version>21</Version>
+        <ProductName>Elvaco CMa10</ProductName>
+        <Medium>Other</Medium>
+        <AccessNumber>13</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Digital Input</Quantity>
+        <Value>2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>46.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>37.820000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>51.220000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>22.620000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>22.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>23.260000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Value during error state</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Value during error state</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>772.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/ZRM_Minol-Minocal-C2.norm.xml b/test/test-frames/ZRM_Minol-Minocal-C2.norm.xml
new file mode 100644
index 00000000..7ac242fe
--- /dev/null
+++ b/test/test-frames/ZRM_Minol-Minocal-C2.norm.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>31425084</Id>
+        <Manufacturer>ZRM</Manufacturer>
+        <Version>129</Version>
+        <ProductName>Minol Minocal C2</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>115</AccessNumber>
+        <Status>27</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2015-01-01T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>10</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.074000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.043000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-09-01T08:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>2000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-09-01T08:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>20.710000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>20.380000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2014-03-13T12:45:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-03-01</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>33</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-02-01</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>33</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>34</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>34</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>35</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-12-01</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>35</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>36</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-11-01</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>36</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>37</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-10-01</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>37</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>38</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-09-01</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>38</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>39</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-08-01</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>39</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="31">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-03-01</Value>
+    </DataRecord>
+
+    <DataRecord id="32">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="33">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/abb_delta.norm.xml b/test/test-frames/abb_delta.norm.xml
new file mode 100644
index 00000000..6b82deb6
--- /dev/null
+++ b/test/test-frames/abb_delta.norm.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>78563412</Id>
+        <Manufacturer>ABB</Manufacturer>
+        <Version>2</Version>
+        <ProductName>ABB Delta-Meter</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>69</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>1000000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/abb_f95.norm.xml b/test/test-frames/abb_f95.norm.xml
new file mode 100644
index 00000000..52f18667
--- /dev/null
+++ b/test/test-frames/abb_f95.norm.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>26718590</Id>
+        <Manufacturer>HYD</Manufacturer>
+        <Version>40</Version>
+        <ProductName>ABB F95 Typ US770</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>115</AccessNumber>
+        <Status>50</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.074200</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>1311041.300000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>11.041300</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>20.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>20.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-13T16:34:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-04-30T23:59:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-04-30T23:59:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-12-31T23:59:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>311590800.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/allmess_cf50.norm.xml b/test/test-frames/allmess_cf50.norm.xml
new file mode 100644
index 00000000..2195924e
--- /dev/null
+++ b/test/test-frames/allmess_cf50.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>2205100</Id>
+        <Manufacturer>SLB</Manufacturer>
+        <Version>2</Version>
+        <ProductName>Allmess Megacontrol CF-50</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>0</AccessNumber>
+        <Status>88</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.300000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>128.800000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>51.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>77.230000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-01-12</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>292291200.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>60 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/berg_dz_plus.norm.xml b/test/test-frames/berg_dz_plus.norm.xml
new file mode 100644
index 00000000..b4def167
--- /dev/null
+++ b/test/test-frames/berg_dz_plus.norm.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>0</Id>
+        <Manufacturer>ABB</Manufacturer>
+        <Version>2</Version>
+        <ProductName>ABB Delta-Meter</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>0</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/electricity-meter-1.norm.xml b/test/test-frames/electricity-meter-1.norm.xml
new file mode 100644
index 00000000..49b42973
--- /dev/null
+++ b/test/test-frames/electricity-meter-1.norm.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>500023E</Id>
+        <Manufacturer>SBC</Manufacturer>
+        <Version>18</Version>
+        <ProductName></ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>19</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>12520.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>12520.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>17744330.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>17744330.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>237.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>3.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>790.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-180.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>231.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>3.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>810.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-150.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>228.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>6.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>1600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-320.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>3200.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-650.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/electricity-meter-2.norm.xml b/test/test-frames/electricity-meter-2.norm.xml
new file mode 100644
index 00000000..c8d95e23
--- /dev/null
+++ b/test/test-frames/electricity-meter-2.norm.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>50002E5</Id>
+        <Manufacturer>@@@</Manufacturer>
+        <Version>18</Version>
+        <ProductName></ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>37</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>2540.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>2540.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>4441280.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>4441280.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>233.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>234.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>235.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Manufacturer specific</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/els_falcon.norm.xml b/test/test-frames/els_falcon.norm.xml
new file mode 100644
index 00000000..c0f2ff4d
--- /dev/null
+++ b/test/test-frames/els_falcon.norm.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>70112345</Id>
+        <Manufacturer>ELS</Manufacturer>
+        <Version>10</Version>
+        <ProductName>Elster Falcon</ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>2</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1234.567000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2007-02-06T13:58:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2007-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>456.951000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2008-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>5.945000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2008-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>6.137000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>0E 42 20 01 01 01 00 05 08 5E 01 20 3D 12 08 3D 12 08 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/els_tmpa_telegramm1.norm.xml b/test/test-frames/els_tmpa_telegramm1.norm.xml
new file mode 100644
index 00000000..16a06819
--- /dev/null
+++ b/test/test-frames/els_tmpa_telegramm1.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>70112345</Id>
+        <Manufacturer>ELS</Manufacturer>
+        <Version>2</Version>
+        <ProductName>Elster TMP-A</ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>2</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1234.567000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2007-02-06T13:58:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2007-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>456.951000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2008-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/elv_temp_humid.norm.xml b/test/test-frames/elv_temp_humid.norm.xml
new file mode 100644
index 00000000..369720a5
--- /dev/null
+++ b/test/test-frames/elv_temp_humid.norm.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>54000834</Id>
+        <Manufacturer>ELV</Manufacturer>
+        <Version>50</Version>
+        <ProductName>Elvaco CMa11</ProductName>
+        <Medium>Other</Medium>
+        <AccessNumber>242</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Digital Input</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>45.640000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>45.520000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>%RH</Quantity>
+        <Value>58.120000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>22.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Minimum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>21.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>23.390000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>86400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>22.760000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>22.690000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>54000834.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>262144.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/emh_diz.norm.xml b/test/test-frames/emh_diz.norm.xml
new file mode 100644
index 00000000..7a9a6fc9
--- /dev/null
+++ b/test/test-frames/emh_diz.norm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>623702</Id>
+        <Manufacturer>EMH</Manufacturer>
+        <Version>0</Version>
+        <ProductName>EMH DIZ</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>7</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>4090.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/engelmann_sensostar2c.norm.xml b/test/test-frames/engelmann_sensostar2c.norm.xml
new file mode 100644
index 00000000..97331437
--- /dev/null
+++ b/test/test-frames/engelmann_sensostar2c.norm.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>10380010</Id>
+        <Manufacturer>EFE</Manufacturer>
+        <Version>1</Version>
+        <ProductName>Engelmann SensoStar 2C</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>30</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>10380010.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-06-06T20:50:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>12.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>800000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>95.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>43.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>52.580000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>43718400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>12.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>800000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2010-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>8.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>500000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/example_data_01.norm.xml b/test/test-frames/example_data_01.norm.xml
new file mode 100644
index 00000000..54ba0bb1
--- /dev/null
+++ b/test/test-frames/example_data_01.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>3575845</Id>
+        <Manufacturer>AMT</Manufacturer>
+        <Version>52</Version>
+        <ProductName></ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>158</AccessNumber>
+        <Status>00</Status>
+        <Signature>B627</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1389817000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>504647.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>41.737434</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>35.463650</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/example_data_02.norm.xml b/test/test-frames/example_data_02.norm.xml
new file mode 100644
index 00000000..d135aae2
--- /dev/null
+++ b/test/test-frames/example_data_02.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>3575845</Id>
+        <Manufacturer>AMT</Manufacturer>
+        <Version>52</Version>
+        <ProductName></ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>161</AccessNumber>
+        <Status>00</Status>
+        <Signature>B627</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1389817000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>504647.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>41.211052</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>35.385593</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/filler.norm.xml b/test/test-frames/filler.norm.xml
new file mode 100644
index 00000000..f7a01342
--- /dev/null
+++ b/test/test-frames/filler.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>17677731</Id>
+        <Manufacturer>KAM</Manufacturer>
+        <Version>1</Version>
+        <ProductName>Kamstrup 382 (6850-005)</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>0</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>5000.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/frame1.norm.xml b/test/test-frames/frame1.norm.xml
new file mode 100644
index 00000000..92877062
--- /dev/null
+++ b/test/test-frames/frame1.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>10060958</Id>
+        <Manufacturer>LSE</Manufacturer>
+        <Version>22</Version>
+        <ProductName></ProductName>
+        <Medium>Bus/System</Medium>
+        <AccessNumber>123</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>5F 42 01 11 FF FF FF FF 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/frame2.norm.xml b/test/test-frames/frame2.norm.xml
new file mode 100644
index 00000000..0b29cb81
--- /dev/null
+++ b/test/test-frames/frame2.norm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>PAD</Manufacturer>
+        <Version>1</Version>
+        <ProductName></ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>85</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>12.565000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Maximum value</Function>
+        <StorageNumber>5</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.113000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>218370.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/gmc_emmod206.norm.xml b/test/test-frames/gmc_emmod206.norm.xml
new file mode 100644
index 00000000..da2ec220
--- /dev/null
+++ b/test/test-frames/gmc_emmod206.norm.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>GMC</Manufacturer>
+        <Version>230</Version>
+        <ProductName>GMC-I A230 EMMOD 206</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>2</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>86.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>95.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>3</Device>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>105.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.957000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>1.055000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>3</Device>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>1.150000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>224.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>-202.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>103880.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>150000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>201590.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>250000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>300910.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>2</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>350000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>3</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>402370.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>3</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>450000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>224.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>4</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>6</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>202.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_bm_+m.norm.xml b/test/test-frames/itron_bm_+m.norm.xml
new file mode 100644
index 00000000..cfe33275
--- /dev/null
+++ b/test/test-frames/itron_bm_+m.norm.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11490378</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>14</Version>
+        <ProductName>Itron BM +m</ProductName>
+        <Medium>Cold water</Medium>
+        <AccessNumber>41</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11490378.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>54.321000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-00-00</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T13:29:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>2.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>6.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 00 8F 13</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cf_51.norm.xml b/test/test-frames/itron_cf_51.norm.xml
new file mode 100644
index 00000000..88f69345
--- /dev/null
+++ b/test/test-frames/itron_cf_51.norm.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11155185</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>10</Version>
+        <ProductName>Itron CF 51</ProductName>
+        <Medium>Heat / Cooling load meter</Medium>
+        <AccessNumber>27</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11155185.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>99999900.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>999.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>999.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>9999.990000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T13:24:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>8985600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>11.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>26.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>321.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1.230000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>03 20</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cf_55.norm.xml b/test/test-frames/itron_cf_55.norm.xml
new file mode 100644
index 00000000..f035c35d
--- /dev/null
+++ b/test/test-frames/itron_cf_55.norm.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11127667</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>11</Version>
+        <ProductName>Itron CF 55</ProductName>
+        <Medium>Heat: Inlet</Medium>
+        <AccessNumber>11</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11127667.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>99999900.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>999.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>999.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>9999.990000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T11:47:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>21772800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>10.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>21.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>03 20</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cf_echo_2.norm.xml b/test/test-frames/itron_cf_echo_2.norm.xml
new file mode 100644
index 00000000..d8ec6093
--- /dev/null
+++ b/test/test-frames/itron_cf_echo_2.norm.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11100091</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>9</Version>
+        <ProductName>Itron CF Echo 2</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>81</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11100091.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>99999900.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>999.999000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>20.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>20.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.090000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T13:29:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>33264000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>19.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>45.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>20 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cyble_m-bus_v1.4_cold_water.norm.xml b/test/test-frames/itron_cyble_m-bus_v1.4_cold_water.norm.xml
new file mode 100644
index 00000000..da7eb622
--- /dev/null
+++ b/test/test-frames/itron_cyble_m-bus_v1.4_cold_water.norm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>10020380</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>20</Version>
+        <ProductName>Itron CYBLE M-Bus 1.4</ProductName>
+        <Medium>Cold water</Medium>
+        <AccessNumber>161</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>10020380.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>cust. ID</Quantity>
+        <Value>          </Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-10-25T15:39:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>bat. time</Quantity>
+        <Value>4050.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>453.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>453.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 04 1F</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cyble_m-bus_v1.4_gas.norm.xml b/test/test-frames/itron_cyble_m-bus_v1.4_gas.norm.xml
new file mode 100644
index 00000000..a325227b
--- /dev/null
+++ b/test/test-frames/itron_cyble_m-bus_v1.4_gas.norm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>10020387</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>20</Version>
+        <ProductName>Itron CYBLE M-Bus 1.4</ProductName>
+        <Medium>Gas</Medium>
+        <AccessNumber>154</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>10020387.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>cust. ID</Quantity>
+        <Value>          </Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-10-25T15:43:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>bat. time</Quantity>
+        <Value>4050.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.260000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.250000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 02 1F</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_cyble_m-bus_v1.4_water.norm.xml b/test/test-frames/itron_cyble_m-bus_v1.4_water.norm.xml
new file mode 100644
index 00000000..4e120cdc
--- /dev/null
+++ b/test/test-frames/itron_cyble_m-bus_v1.4_water.norm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12000071</Id>
+        <Manufacturer>ACW</Manufacturer>
+        <Version>20</Version>
+        <ProductName>Itron CYBLE M-Bus 1.4</ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>10</AccessNumber>
+        <Status>30</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>12000071.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>cust. ID</Quantity>
+        <Value>TEST CYBLE</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T13:43:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>bat. time</Quantity>
+        <Value>4338.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>123.490000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>10 01 1F</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/itron_integral_mk_maxx.norm.xml b/test/test-frames/itron_integral_mk_maxx.norm.xml
new file mode 100644
index 00000000..bfc94867
--- /dev/null
+++ b/test/test-frames/itron_integral_mk_maxx.norm.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>11817314</Id>
+        <Manufacturer>SLB</Manufacturer>
+        <Version>6</Version>
+        <ProductName>CF Compact / Integral MK MaXX</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>93</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>11817314.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.020000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>21.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>21.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.070000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>34300800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-24T14:17:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1.230000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>3.210000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>3.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Software version</Quantity>
+        <Value>18.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 16</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/kamstrup_382_005.norm.xml b/test/test-frames/kamstrup_382_005.norm.xml
new file mode 100644
index 00000000..d3246e19
--- /dev/null
+++ b/test/test-frames/kamstrup_382_005.norm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>14839120</Id>
+        <Manufacturer>KAM</Manufacturer>
+        <Version>1</Version>
+        <ProductName>Kamstrup 382 (6850-005)</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>4</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>32400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 10</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/kamstrup_multical_601.norm.xml b/test/test-frames/kamstrup_multical_601.norm.xml
new file mode 100644
index 00000000..769a90b4
--- /dev/null
+++ b/test/test-frames/kamstrup_multical_601.norm.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>6855817</Id>
+        <Manufacturer>KAM</Manufacturer>
+        <Version>8</Version>
+        <ProductName>Kamstrup Multical 601</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>4</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>6855817.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>37351000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>561.080000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>3546000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>101.690000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>46.160000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>55.530000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>34700.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>44800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.543000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.628000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>3</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-01-05T15:26:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>33361000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>500.980000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>55000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>1.027000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>3</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2010-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>00 00 00 00 E7 E4 00 00 63 66 00 00 00 00 00 00 00 00 00 00 00 00 00 00 5B C9 A5 02 34 53 00 00 E0 B2 03 00 89 9C 68 00 00 00 00 00 01 00 01 07 07 09 01 03 00 00 00 00 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/landis+gyr_ultraheat_t230.norm.xml b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
new file mode 100644
index 00000000..d30f1cd5
--- /dev/null
+++ b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>66660205</Id>
+        <Manufacturer>LUG</Manufacturer>
+        <Version>7</Version>
+        <ProductName>Landis &amp; Gyr Ultraheat T230</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>1</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>8.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>19.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>19.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>-0.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>66660205.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>420.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>13568400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>13568400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>5</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>30.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>50.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>41065374.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>40953732.300000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Value during error state</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>12488400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>5</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>30.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="31">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>50.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="32">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>510</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2127-01-01T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="33">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-13T12:04:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="34">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>09 07 00 66 01</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/manual_frame2.norm.xml b/test/test-frames/manual_frame2.norm.xml
new file mode 100644
index 00000000..c6124757
--- /dev/null
+++ b/test/test-frames/manual_frame2.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Medium>Water</Medium>
+        <AccessNumber>10</AccessNumber>
+        <Status>00</Status>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Actual value</Function>
+        <Unit>l</Unit>
+        <Value>1</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Actual value</Function>
+        <Unit>reserved but historic</Unit>
+        <Value>135</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/manual_frame3.norm.xml b/test/test-frames/manual_frame3.norm.xml
new file mode 100644
index 00000000..0b29cb81
--- /dev/null
+++ b/test/test-frames/manual_frame3.norm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>PAD</Manufacturer>
+        <Version>1</Version>
+        <ProductName></ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>85</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>12.565000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Maximum value</Function>
+        <StorageNumber>5</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.113000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>1</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>218370.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/manual_frame7.norm.xml b/test/test-frames/manual_frame7.norm.xml
new file mode 100644
index 00000000..28c78ac5
--- /dev/null
+++ b/test/test-frames/manual_frame7.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>PAD</Manufacturer>
+        <Version>1</Version>
+        <ProductName></ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>19</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>1020304.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/metrona_pollutherm.norm.xml b/test/test-frames/metrona_pollutherm.norm.xml
new file mode 100644
index 00000000..b3f74934
--- /dev/null
+++ b/test/test-frames/metrona_pollutherm.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>44950146</Id>
+        <Manufacturer>SPX</Manufacturer>
+        <Version>52</Version>
+        <ProductName>Sensus PolluTherm</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>84</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>44950146.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Customer location</Quantity>
+        <Value>44950146.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/metrona_ultraheat_xs.norm.xml b/test/test-frames/metrona_ultraheat_xs.norm.xml
new file mode 100644
index 00000000..82423fe9
--- /dev/null
+++ b/test/test-frames/metrona_ultraheat_xs.norm.xml
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>1810054</Id>
+        <Manufacturer>LUG</Manufacturer>
+        <Version>2</Version>
+        <ProductName>Landis &amp; Gyr Ultraheat 2WR5</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>15</AccessNumber>
+        <Status>10</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>19969000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>26492.180000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>26492.180000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>19969000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>65110054.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>s</Unit>
+        <Quantity>Averaging Duration</Quantity>
+        <Value>3600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>31600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>31600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>8.820000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>44.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>40.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>252241200.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>185792400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Value during error state</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>172141200.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>36.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>40.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="31">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="32">
+        <Function>Value during error state</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>185274000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="33">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>19969000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="34">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="35">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="36">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>4</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="37">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>26492.180000</Value>
+    </DataRecord>
+
+    <DataRecord id="38">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-06-07T00:38:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="39">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>03 02 00 00 23</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/minol_minocal_c2.norm.xml b/test/test-frames/minol_minocal_c2.norm.xml
new file mode 100644
index 00000000..bb7cafb7
--- /dev/null
+++ b/test/test-frames/minol_minocal_c2.norm.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>31425084</Id>
+        <Manufacturer>ZRM</Manufacturer>
+        <Version>129</Version>
+        <ProductName>Minol Minocal C2</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>36</AccessNumber>
+        <Status>27</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2013-01-01T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>10</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.073000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.043000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-09-01T08:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>2000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-09-01T08:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>20.090000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>19.270000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-13T11:53:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>33</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-12-01</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>33</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>34</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-11-01</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>34</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>35</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-10-01</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>35</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>3000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>36</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-09-01</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>36</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>37</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-08-01</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>37</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>38</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-07-01</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>38</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>39</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2011-06-01</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>39</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="31">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="32">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="33">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/minol_minocal_wr3.norm.xml b/test/test-frames/minol_minocal_wr3.norm.xml
new file mode 100644
index 00000000..19ddead9
--- /dev/null
+++ b/test/test-frames/minol_minocal_wr3.norm.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>31802759</Id>
+        <Manufacturer>ZRM</Manufacturer>
+        <Version>130</Version>
+        <ProductName>Minol Minocal WR3</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>43</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.010000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>9</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-01T00:00:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Maximum value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-13T11:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.010000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Maximum value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-03-24T07:30:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit></Unit>
+        <Quantity>(Enhanced) Identification</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit></Unit>
+        <Quantity>Device type</Quantity>
+        <Value>7.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>9</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit></Unit>
+        <Quantity>(Enhanced) Identification</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit></Unit>
+        <Quantity>Device type</Quantity>
+        <Value>7.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>10</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>4.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2012-01-13T12:01:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.001000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-01-01</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Maximum value</Function>
+        <StorageNumber>32</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/nzr_dhz_5_63.norm.xml b/test/test-frames/nzr_dhz_5_63.norm.xml
new file mode 100644
index 00000000..46dfb585
--- /dev/null
+++ b/test/test-frames/nzr_dhz_5_63.norm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>30100608</Id>
+        <Manufacturer>NZR</Manufacturer>
+        <Version>1</Version>
+        <ProductName>NZR DHZ 5/63</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>1</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1274.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1274.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>237.200000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>30100608.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>0E</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/oms_frame1.norm.xml b/test/test-frames/oms_frame1.norm.xml
new file mode 100644
index 00000000..1dfd8649
--- /dev/null
+++ b/test/test-frames/oms_frame1.norm.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>ELS</Manufacturer>
+        <Version>51</Version>
+        <ProductName></ProductName>
+        <Medium>Gas</Medium>
+        <AccessNumber>42</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>28504.270000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2008-05-31T23:50:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/oms_frame2.norm.xml b/test/test-frames/oms_frame2.norm.xml
new file mode 100644
index 00000000..480c8920
--- /dev/null
+++ b/test/test-frames/oms_frame2.norm.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>92752244</Id>
+        <Manufacturer>HYD</Manufacturer>
+        <Version>41</Version>
+        <ProductName></ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>31</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>2850.427000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.127000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1445.419000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2007-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/oms_frame3.norm.xml b/test/test-frames/oms_frame3.norm.xml
new file mode 100644
index 00000000..f144e0ee
--- /dev/null
+++ b/test/test-frames/oms_frame3.norm.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>12345678</Id>
+        <Manufacturer>HYD</Manufacturer>
+        <Version>42</Version>
+        <ProductName></ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>38</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>2850427000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>703.476000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>1445419000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2007-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.127000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>329.700000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>44.300000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>25.100000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Error flags</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/ram_modularis.norm.xml b/test/test-frames/ram_modularis.norm.xml
new file mode 100644
index 00000000..3f6b3f9c
--- /dev/null
+++ b/test/test-frames/ram_modularis.norm.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>25776</Id>
+        <Manufacturer>RAM</Manufacturer>
+        <Version>3</Version>
+        <ProductName>Rossweiner ETK/ETW Modularis</ProductName>
+        <Medium>Water</Medium>
+        <AccessNumber>139</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>10.116000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2013-10-18T21:40:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-09-28</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>8.393000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2014-09-28</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>25776.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-09-30</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>2</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>8.527000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>3</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-10-31</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>3</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>99999.995000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>4</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-11-30</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>4</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>99999.993000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>5</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2012-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>5</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.782000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>6</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-01-31</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>6</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1.929000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>7</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-02-28</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>7</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>3.092000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-03-31</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>8</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>4.661000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>9</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-04-30</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>9</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>4.767000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>10</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-05-31</Value>
+    </DataRecord>
+
+    <DataRecord id="23">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>10</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>5.124000</Value>
+    </DataRecord>
+
+    <DataRecord id="24">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>11</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-06-30</Value>
+    </DataRecord>
+
+    <DataRecord id="25">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>11</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>5.176000</Value>
+    </DataRecord>
+
+    <DataRecord id="26">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>12</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-07-31</Value>
+    </DataRecord>
+
+    <DataRecord id="27">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>12</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>5.246000</Value>
+    </DataRecord>
+
+    <DataRecord id="28">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>13</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2013-08-31</Value>
+    </DataRecord>
+
+    <DataRecord id="29">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>13</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>5.668000</Value>
+    </DataRecord>
+
+    <DataRecord id="30">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>01 00 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/rel_padpuls2.norm.xml b/test/test-frames/rel_padpuls2.norm.xml
new file mode 100644
index 00000000..14f88c8c
--- /dev/null
+++ b/test/test-frames/rel_padpuls2.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>4</Id>
+        <Manufacturer>REL</Manufacturer>
+        <Version>18</Version>
+        <ProductName>Relay PadPuls M4</ProductName>
+        <Medium>Other</Medium>
+        <AccessNumber>1</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2001-09-20T13:16:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2001-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>43 01 01 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/rel_padpuls3.norm.xml b/test/test-frames/rel_padpuls3.norm.xml
new file mode 100644
index 00000000..b6dafa74
--- /dev/null
+++ b/test/test-frames/rel_padpuls3.norm.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>1030101</Id>
+        <Manufacturer>REL</Manufacturer>
+        <Version>64</Version>
+        <ProductName>Relay PadPuls M2</ProductName>
+        <Medium>Heat Cost Allocator</Medium>
+        <AccessNumber>30</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>1987.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2000-12-31T10:41:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>1302.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2001-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>C0 01 01 0C</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/sen_pollusonic_2.norm.xml b/test/test-frames/sen_pollusonic_2.norm.xml
new file mode 100644
index 00000000..1605e327
--- /dev/null
+++ b/test/test-frames/sen_pollusonic_2.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>90919293</Id>
+        <Medium>Heat</Medium>
+        <AccessNumber>16</AccessNumber>
+        <Status>00</Status>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Actual value</Function>
+        <Unit>kWh</Unit>
+        <Value>6531</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Actual value</Function>
+        <Unit>l</Unit>
+        <Value>69</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/sen_pollutherm.norm.xml b/test/test-frames/sen_pollutherm.norm.xml
new file mode 100644
index 00000000..56b08c30
--- /dev/null
+++ b/test/test-frames/sen_pollutherm.norm.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>21050076</Id>
+        <Manufacturer>SPX</Manufacturer>
+        <Version>49</Version>
+        <ProductName>Sensus PolluTherm</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>81</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>8640000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>7998.920000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>54580.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>75.500000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>59.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>16.076000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>21050076.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Customer location</Quantity>
+        <Value>21050076.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/siemens_water.norm.xml b/test/test-frames/siemens_water.norm.xml
new file mode 100644
index 00000000..895a7a5d
--- /dev/null
+++ b/test/test-frames/siemens_water.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>8021382</Id>
+        <Manufacturer>LSE</Manufacturer>
+        <Version>153</Version>
+        <ProductName>Siemens WFH21</ProductName>
+        <Medium>Warm water (30-90°C)</Medium>
+        <AccessNumber>235</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.101000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>75427200.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-09-14T08:56:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-00-00</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>8021382.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Device type</Quantity>
+        <Value>2173253517322.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Parameter set identification</Quantity>
+        <Value>WFH21</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>37 FD 17 00 00 00 00 00 00 00 00 02 7A 0D 00 02 78 0D 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/siemens_wfh21.norm.xml b/test/test-frames/siemens_wfh21.norm.xml
new file mode 100644
index 00000000..afd7f9fc
--- /dev/null
+++ b/test/test-frames/siemens_wfh21.norm.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>8006491</Id>
+        <Manufacturer>LSE</Manufacturer>
+        <Version>153</Version>
+        <ProductName>Siemens WFH21</ProductName>
+        <Medium>Warm water (30-90°C)</Medium>
+        <AccessNumber>218</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>158709600.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2011-12-01T10:36:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Value during error state</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-00-00</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>8006491.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Device type</Quantity>
+        <Value>2173253517322.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Parameter set identification</Quantity>
+        <Value>WFH21</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Firmware version</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2010-12-31</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>37 FD 17 00 00 00 00 00 00 00 00 02 7A 25 00 02 78 25 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/sontex_supercal_531_telegram1.norm.xml b/test/test-frames/sontex_supercal_531_telegram1.norm.xml
new file mode 100644
index 00000000..be48c61d
--- /dev/null
+++ b/test/test-frames/sontex_supercal_531_telegram1.norm.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>8420624</Id>
+        <Manufacturer>SON</Manufacturer>
+        <Version>13</Version>
+        <ProductName>Sontex Supercal 531</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>44</AccessNumber>
+        <Status>30</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>J</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>J</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/svm_f22_telegram1.norm.xml b/test/test-frames/svm_f22_telegram1.norm.xml
new file mode 100644
index 00000000..48b84043
--- /dev/null
+++ b/test/test-frames/svm_f22_telegram1.norm.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>1006089</Id>
+        <Manufacturer>SVM</Manufacturer>
+        <Version>9</Version>
+        <ProductName>Elster F4 / Kamstrup SVM F22</ProductName>
+        <Medium>Heat: Inlet</Medium>
+        <AccessNumber>148</AccessNumber>
+        <Status>70</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>28014000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>640.581000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>640.581000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>243.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>243.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>22932000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>Operating time</Quantity>
+        <Value>22906800.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2021-02-08T21:12:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>1</Device>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>0</Tariff>
+        <Device>2</Device>
+        <Unit>Units for H.C.A.</Unit>
+        <Quantity>H.C.A.</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/tch_telegramm1.norm.xml b/test/test-frames/tch_telegramm1.norm.xml
new file mode 100644
index 00000000..bdaaa224
--- /dev/null
+++ b/test/test-frames/tch_telegramm1.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>21519982</Id>
+        <Manufacturer>TCH</Manufacturer>
+        <Version>38</Version>
+        <ProductName>Techem m-bus S</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>133</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2000-09-29T13:50:00Z</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>1</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date)</Quantity>
+        <Value>2000-05-29</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>23.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>22.400000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>0.064000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/wmbus-converted.norm.xml b/test/test-frames/wmbus-converted.norm.xml
new file mode 100644
index 00000000..f7a01342
--- /dev/null
+++ b/test/test-frames/wmbus-converted.norm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>17677731</Id>
+        <Manufacturer>KAM</Manufacturer>
+        <Version>1</Version>
+        <ProductName>Kamstrup 382 (6850-005)</ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>0</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>5000.000000</Value>
+    </DataRecord>
+
+</MBusData>

From a7fb39fa23b8d5fe82ae42ee2d37701980ab2e9d Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Mon, 6 Jul 2020 14:10:25 +0200
Subject: [PATCH 06/29] Fix VIF descriptions

---
 mbus/mbus-protocol-aux.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index c932f7e1..8479d063 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -201,10 +201,10 @@ mbus_variable_vif vif_table[] = {
     { 0x73, 86400.0, "s", "Averaging Duration" },  /* days    */
 
     /* E111 01nn     Actuality Duration s */
-    { 0x74,     1.0, "s", "Averaging Duration" },  /* seconds */
-    { 0x75,    60.0, "s", "Averaging Duration" },  /* minutes */
-    { 0x76,  3600.0, "s", "Averaging Duration" },  /* hours   */
-    { 0x77, 86400.0, "s", "Averaging Duration" },  /* days    */
+    { 0x74,     1.0, "s", "Actuality Duration" },  /* seconds */
+    { 0x75,    60.0, "s", "Actuality Duration" },  /* minutes */
+    { 0x76,  3600.0, "s", "Actuality Duration" },  /* hours   */
+    { 0x77, 86400.0, "s", "Actuality Duration" },  /* days    */
 
     /* Fabrication No */
     { 0x78, 1.0, "", "Fabrication No" },
@@ -247,7 +247,7 @@ mbus_variable_vif vif_table[] = {
     { 0x108, 1.0e0,  "", "Access Number (transmission count)" },
 
     /* E000 1001 Medium (as in fixed header) */
-    { 0x109, 1.0e0,  "", "Device type" },
+    { 0x109, 1.0e0,  "", "Medium" },
 
     /* E000 1010 Manufacturer (as in fixed header) */
     { 0x10A, 1.0e0,  "", "Manufacturer" },
@@ -256,7 +256,7 @@ mbus_variable_vif vif_table[] = {
     { 0x10B, 1.0e0,  "", "Parameter set identification" },
 
     /* E000 1100 Model / Version */
-    { 0x10C, 1.0e0,  "", "Device type" },
+    { 0x10C, 1.0e0,  "", "Model / Version" },
 
     /* E000 1101 Hardware version # */
     { 0x10D, 1.0e0,  "", "Hardware version" },
@@ -356,9 +356,9 @@ mbus_variable_vif vif_table[] = {
     { 0x130, 1.0e0,  "Reserved", "Reserved" }, /* ???? */
 
     /* E011 00nn Duration of tariff (nn=01 ..11: min to days) */
-    { 0x131,       60.0,  "s", "Storage interval" },   /* minute(s) */
-    { 0x132,     3600.0,  "s", "Storage interval" },   /* hour(s)   */
-    { 0x133,    86400.0,  "s", "Storage interval" },   /* day(s)    */
+    { 0x131,       60.0,  "s", "Duration of tariff" },   /* minute(s) */
+    { 0x132,     3600.0,  "s", "Duration of tariff" },   /* hour(s)   */
+    { 0x133,    86400.0,  "s", "Duration of tariff" },   /* day(s)    */
 
     /* E011 01nn Period of tariff [sec(s) to day(s)]  */
     { 0x134,        1.0, "s", "Period of tariff" },  /* seconds  */

From d0406df92a238741c2d6842ef8d7ea47370ab593 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Mon, 6 Jul 2020 14:13:27 +0200
Subject: [PATCH 07/29] Update normalized XML files

This updates the affected XML files after the recent fixes to the VIF
description.
---
 test/test-frames/landis+gyr_ultraheat_t230.norm.xml | 2 +-
 test/test-frames/metrona_ultraheat_xs.norm.xml      | 2 +-
 test/test-frames/minol_minocal_wr3.norm.xml         | 4 ++--
 test/test-frames/siemens_water.norm.xml             | 2 +-
 test/test-frames/siemens_wfh21.norm.xml             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test-frames/landis+gyr_ultraheat_t230.norm.xml b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
index d30f1cd5..70309869 100644
--- a/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
+++ b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
@@ -16,7 +16,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>s</Unit>
-        <Quantity>Averaging Duration</Quantity>
+        <Quantity>Actuality Duration</Quantity>
         <Value>4.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/metrona_ultraheat_xs.norm.xml b/test/test-frames/metrona_ultraheat_xs.norm.xml
index 82423fe9..55779d2c 100644
--- a/test/test-frames/metrona_ultraheat_xs.norm.xml
+++ b/test/test-frames/metrona_ultraheat_xs.norm.xml
@@ -16,7 +16,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>s</Unit>
-        <Quantity>Averaging Duration</Quantity>
+        <Quantity>Actuality Duration</Quantity>
         <Value>4.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/minol_minocal_wr3.norm.xml b/test/test-frames/minol_minocal_wr3.norm.xml
index 19ddead9..6db54925 100644
--- a/test/test-frames/minol_minocal_wr3.norm.xml
+++ b/test/test-frames/minol_minocal_wr3.norm.xml
@@ -132,7 +132,7 @@
         <Tariff>0</Tariff>
         <Device>1</Device>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Medium</Quantity>
         <Value>7.000000</Value>
     </DataRecord>
 
@@ -182,7 +182,7 @@
         <Tariff>0</Tariff>
         <Device>2</Device>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Medium</Quantity>
         <Value>7.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/siemens_water.norm.xml b/test/test-frames/siemens_water.norm.xml
index 895a7a5d..a49f1d3a 100644
--- a/test/test-frames/siemens_water.norm.xml
+++ b/test/test-frames/siemens_water.norm.xml
@@ -56,7 +56,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Model / Version</Quantity>
         <Value>2173253517322.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/siemens_wfh21.norm.xml b/test/test-frames/siemens_wfh21.norm.xml
index afd7f9fc..cac68af0 100644
--- a/test/test-frames/siemens_wfh21.norm.xml
+++ b/test/test-frames/siemens_wfh21.norm.xml
@@ -56,7 +56,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Model / Version</Quantity>
         <Value>2173253517322.000000</Value>
     </DataRecord>
 

From 8fe42f9ede656f5dfd1c23682e7afb0afe851bc3 Mon Sep 17 00:00:00 2001
From: Anders Wennmo <anders.wennmo@gmail.com>
Date: Thu, 4 Jun 2020 12:35:58 +0200
Subject: [PATCH 08/29] Implement all of VIF extensions for 0xFD (#166)

---
 mbus/mbus-protocol.c                          | 453 ++++++++++++++----
 .../EMU_EMU-Professional-375-M-Bus.xml        |   2 +-
 test/test-frames/LGB_G350.xml                 |   2 +-
 3 files changed, 363 insertions(+), 94 deletions(-)

diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
index 311abbba..0d813a20 100755
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@@ -2438,6 +2438,356 @@ mbus_data_error_lookup(int error)
     return buff;
 }
 
+static const char *
+mbus_unit_duration_nn(int nn)
+{
+    switch (nn)
+    {
+        case 0:
+            return "second(s)";
+        case 1:
+            return "minute(s)";
+        case 2:
+            return "hour(s)";
+        case 3:
+            return "day(s)";
+    }
+    return "error: out-of-range";
+}
+
+static const char *
+mbus_unit_duration_pp(int pp)
+{
+    switch (pp)
+    {
+        case 0:
+            return "hour(s)";
+
+        case 1:
+            return "day(s)";
+
+        case 2:
+            return "month(s)";
+
+        case 3:
+            return "year(s)";
+    }
+    return "error: out-of-range";
+}
+
+static const char *
+mbus_vib_unit_lookup_fb(mbus_value_information_block *vib)
+{
+    static char buff[256];
+    snprintf(buff, sizeof(buff), "Unrecognized VIF extension: 0xFB,0x%.2X", vib->vife[0]);
+    return buff;
+}
+
+static const char *
+mbus_vib_unit_lookup_fd(mbus_value_information_block *vib)
+{
+    static char buff[256];
+    int n;
+
+    // ignore the extension bit in this selection
+    const unsigned char masked_vife0 = vib->vife[0] & MBUS_DIB_VIF_WITHOUT_EXTENSION;
+
+    if ((masked_vife0 & 0x7C) == 0x00)
+    {
+        // VIFE = E000 00nn	Credit of 10nn-3 of the nominal local legal currency units
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Credit of %s of the nominal local legal currency units", mbus_unit_prefix(n - 3));
+    }
+    else if ((masked_vife0 & 0x7C) == 0x04)
+    {
+        // VIFE = E000 01nn Debit of 10nn-3 of the nominal local legal currency units
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Debit of %s of the nominal local legal currency units", mbus_unit_prefix(n - 3));
+    }
+    else if (masked_vife0 == 0x08)
+    {
+        // E000 1000
+        snprintf(buff, sizeof(buff), "Access Number (transmission count)");
+    }
+    else if (masked_vife0 == 0x09)
+    {
+        // E000 1001
+        snprintf(buff, sizeof(buff), "Medium (as in fixed header)");
+    }
+    else if (masked_vife0 == 0x0A)
+    {
+        // E000 1010
+        snprintf(buff, sizeof(buff), "Manufacturer (as in fixed header)");
+    }
+    else if (masked_vife0 == 0x0B)
+    {
+        // E000 1010
+        snprintf(buff, sizeof(buff), "Parameter set identification");
+    }
+    else if (masked_vife0 == 0x0C)
+    {
+        // E000 1100
+        snprintf(buff, sizeof(buff), "Model / Version");
+    }
+    else if (masked_vife0 == 0x0D)
+    {
+        // E000 1100
+        snprintf(buff, sizeof(buff), "Hardware version");
+    }
+    else if (masked_vife0 == 0x0E)
+    {
+        // E000 1101
+        snprintf(buff, sizeof(buff), "Firmware version");
+    }
+    else if (masked_vife0 == 0x0F)
+    {
+        // E000 1101
+        snprintf(buff, sizeof(buff), "Software version");
+    }
+    else if (masked_vife0 == 0x10)
+    {
+        // VIFE = E001 0000 Customer location
+        snprintf(buff, sizeof(buff), "Customer location");
+    }
+    else if (masked_vife0 == 0x11)
+    {
+        // VIFE = E001 0001 Customer
+        snprintf(buff, sizeof(buff), "Customer");
+    }
+    else if (masked_vife0 == 0x12)
+    {
+        // VIFE = E001 0010	Access Code User
+        snprintf(buff, sizeof(buff), "Access Code User");
+    }
+    else if (masked_vife0 == 0x13)
+    {
+        // VIFE = E001 0011	Access Code Operator
+        snprintf(buff, sizeof(buff), "Access Code Operator");
+    }
+    else if (masked_vife0 == 0x14)
+    {
+        // VIFE = E001 0100	Access Code System Operator
+        snprintf(buff, sizeof(buff), "Access Code System Operator");
+    }
+    else if (masked_vife0 == 0x15)
+    {
+        // VIFE = E001 0101	Access Code Developer
+        snprintf(buff, sizeof(buff), "Access Code Developer");
+    }
+    else if (masked_vife0 == 0x16)
+    {
+        // VIFE = E001 0110 Password
+        snprintf(buff, sizeof(buff), "Password");
+    }
+    else if (masked_vife0 == 0x17)
+    {
+        // VIFE = E001 0111 Error flags
+        snprintf(buff, sizeof(buff), "Error flags");
+    }
+    else if (masked_vife0 == 0x18)
+    {
+        // VIFE = E001 1000	Error mask
+        snprintf(buff, sizeof(buff), "Error mask");
+    }
+    else if (masked_vife0 == 0x19)
+    {
+        // VIFE = E001 1001	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if (masked_vife0 == 0x1A)
+    {
+        // VIFE = E001 1010 Digital output (binary)
+        snprintf(buff, sizeof(buff), "Digital output (binary)");
+    }
+    else if (masked_vife0 == 0x1B)
+    {
+        // VIFE = E001 1011 Digital input (binary)
+        snprintf(buff, sizeof(buff), "Digital input (binary)");
+    }
+    else if (masked_vife0 == 0x1C)
+    {
+        // VIFE = E001 1100	Baudrate [Baud]
+        snprintf(buff, sizeof(buff), "Baudrate");
+    }
+    else if (masked_vife0 == 0x1D)
+    {
+        // VIFE = E001 1101	response delay time [bittimes]
+        snprintf(buff, sizeof(buff), "response delay time");
+    }
+    else if (masked_vife0 == 0x1E)
+    {
+        // VIFE = E001 1110	Retry
+        snprintf(buff, sizeof(buff), "Retry");
+    }
+    else if (masked_vife0 == 0x1F)
+    {
+        // VIFE = E001 1111	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if (masked_vife0 == 0x20)
+    {
+        // VIFE = E010 0000	First storage # for cyclic storage
+        snprintf(buff, sizeof(buff), "First storage # for cyclic storage");
+    }
+    else if (masked_vife0 == 0x21)
+    {
+        // VIFE = E010 0001	Last storage # for cyclic storage
+        snprintf(buff, sizeof(buff), "Last storage # for cyclic storage");
+    }
+    else if (masked_vife0 == 0x22)
+    {
+        // VIFE = E010 0010	Size of storage block
+        snprintf(buff, sizeof(buff), "Size of storage block");
+    }
+    else if (masked_vife0 == 0x23)
+    {
+        // VIFE = E010 0011	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if ((masked_vife0 & 0x7C) == 0x24)
+    {
+        // VIFE = E010 01nn	Storage interval [sec(s)..day(s)]
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Storage interval %s", mbus_unit_duration_nn(n));
+    }
+    else if (masked_vife0 == 0x28)
+    {
+        // VIFE = E010 1000	Storage interval month(s)
+        snprintf(buff, sizeof(buff), "Storage interval month(s)");
+    }
+    else if (masked_vife0 == 0x29)
+    {
+        // VIFE = E010 1001	Storage interval year(s)
+        snprintf(buff, sizeof(buff), "Storage interval year(s)");
+    }
+    else if (masked_vife0 == 0x2A)
+    {
+        // VIFE = E010 1010	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if (masked_vife0 == 0x2B)
+    {
+        // VIFE = E010 1011	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if ((masked_vife0 & 0x7C) == 0x2C)
+    {
+        // VIFE = E010 11nn	Duration since last readout [sec(s)..day(s)]
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Duration since last readout %s", mbus_unit_duration_nn(n));
+    }
+    else if (masked_vife0 == 0x30)
+    {
+        // VIFE = E011 0000	Start (date/time) of tariff
+        snprintf(buff, sizeof(buff), "Start (date/time) of tariff");
+    }
+    else if ((masked_vife0 & 0x7C) == 0x30)
+    {
+        // VIFE = E011 00nn	Duration of tariff (nn=01 ..11: min to days)
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Duration of tariff %s", mbus_unit_duration_nn(n));
+    }
+    else if ((masked_vife0 & 0x7C) == 0x34)
+    {
+        // VIFE = E011 01nn	Period of tariff [sec(s) to day(s)]
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Period of tariff %s", mbus_unit_duration_nn(n));
+    }
+    else if (masked_vife0 == 0x38)
+    {
+        // VIFE = E011 1000	Period of tariff months(s)
+        snprintf(buff, sizeof(buff), "Period of tariff months(s)");
+    }
+    else if (masked_vife0 == 0x39)
+    {
+        // VIFE = E011 1001	Period of tariff year(s)
+        snprintf(buff, sizeof(buff), "Period of tariff year(s)");
+    }
+    else if (masked_vife0 == 0x3A)
+    {
+        // VIFE = E011 1010	dimensionless / no VIF
+        snprintf(buff, sizeof(buff), "dimensionless / no VIF");
+    }
+    else if (masked_vife0 == 0x3B)
+    {
+        // VIFE = E011 1011	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if ((masked_vife0 & 0x7C) == 0x3C)
+    {
+        // VIFE = E011 11xx	Reserved
+        snprintf(buff, sizeof(buff), "Reserved");
+    }
+    else if ((masked_vife0 & 0x70) == 0x40)
+    {
+        // VIFE = E100 nnnn 10^(nnnn-9) V
+        n = (masked_vife0 & 0x0F);
+        snprintf(buff, sizeof(buff), "%s V", mbus_unit_prefix(n - 9));
+    }
+    else if ((masked_vife0 & 0x70) == 0x50)
+    {
+        // VIFE = E101 nnnn 10nnnn-12 A
+        n = (masked_vife0 & 0x0F);
+        snprintf(buff, sizeof(buff), "%s A", mbus_unit_prefix(n - 12));
+    }
+    else if (masked_vife0 == 0x60) {
+        // VIFE = E110 0000	Reset counter
+        snprintf(buff, sizeof(buff), "Reset counter");
+    }
+    else if (masked_vife0 == 0x61) {
+        // VIFE = E110 0001	Cumulation counter
+        snprintf(buff, sizeof(buff), "Cumulation counter");
+    }
+    else if (masked_vife0 == 0x62) {
+        // VIFE = E110 0010	Control signal
+        snprintf(buff, sizeof(buff), "Control signal");
+    }
+    else if (masked_vife0 == 0x63) {
+        // VIFE = E110 0011	Day of week
+        snprintf(buff, sizeof(buff), "Day of week");
+    }
+    else if (masked_vife0 == 0x64) {
+        // VIFE = E110 0100	Week number
+        snprintf(buff, sizeof(buff), "Week number");
+    }
+    else if (masked_vife0 == 0x65) {
+        // VIFE = E110 0101	Time point of day change
+        snprintf(buff, sizeof(buff), "Time point of day change");
+    }
+    else if (masked_vife0 == 0x66) {
+        // VIFE = E110 0110	State of parameter activation
+        snprintf(buff, sizeof(buff), "State of parameter activation");
+    }
+    else if (masked_vife0 == 0x67) {
+        // VIFE = E110 0111	Special supplier information
+        snprintf(buff, sizeof(buff), "Special supplier information");
+    }
+    else if ((masked_vife0 & 0x7C) == 0x68) {
+        // VIFE = E110 10pp	Duration since last cumulation [hour(s)..years(s)]Ž
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Duration since last cumulation %s", mbus_unit_duration_pp(n));
+    }
+    else if ((masked_vife0 & 0x7C) == 0x6C) {
+        // VIFE = E110 11pp	Operating time battery [hour(s)..years(s)]Ž
+        n = (masked_vife0 & 0x03);
+        snprintf(buff, sizeof(buff), "Operating time battery %s", mbus_unit_duration_pp(n));
+    }
+    else if (masked_vife0 == 0x70) {
+        // VIFE = E111 0000	Date and time of battery change
+        snprintf(buff, sizeof(buff), "Date and time of battery change");
+    }
+    else if ((masked_vife0 & 0x70) == 0x70)
+    {
+        // VIFE = E111 nnn Reserved
+        snprintf(buff, sizeof(buff), "Reserved VIF extension");
+    }
+    else
+    {
+        snprintf(buff, sizeof(buff), "Unrecognized VIF 0xFD extension: 0x%.2x", masked_vife0);
+    }
+
+    return buff;
+}
 
 //------------------------------------------------------------------------------
 /// Lookup the unit from the VIB (VIF or VIFE)
@@ -2461,104 +2811,23 @@ mbus_vib_unit_lookup(mbus_value_information_block *vib)
     if (vib == NULL)
         return "";
 
-    if (vib->vif == 0xFD || vib->vif == 0xFB) // first type of VIF extention: see table 8.4.4
+    if (vib->vif == 0xFB) // first type of VIF extention: see table 8.4.4
     {
         if (vib->nvife == 0)
         {
-            snprintf(buff, sizeof(buff), "Missing VIF extension");
-        }
-        else if (vib->vife[0] == 0x08 || vib->vife[0] == 0x88)
-        {
-            // E000 1000
-            snprintf(buff, sizeof(buff), "Access Number (transmission count)");
-        }
-        else if (vib->vife[0] == 0x09|| vib->vife[0] == 0x89)
-        {
-            // E000 1001
-            snprintf(buff, sizeof(buff), "Medium (as in fixed header)");
-        }
-        else if (vib->vife[0] == 0x0A || vib->vife[0] == 0x8A)
-        {
-            // E000 1010
-            snprintf(buff, sizeof(buff), "Manufacturer (as in fixed header)");
-        }
-        else if (vib->vife[0] == 0x0B || vib->vife[0] == 0x8B)
-        {
-            // E000 1010
-            snprintf(buff, sizeof(buff), "Parameter set identification");
+            return "Missing VIF extension";
         }
-        else if (vib->vife[0] == 0x0C || vib->vife[0] == 0x8C)
-        {
-            // E000 1100
-            snprintf(buff, sizeof(buff), "Model / Version");
-        }
-        else if (vib->vife[0] == 0x0D || vib->vife[0] == 0x8D)
-        {
-            // E000 1100
-            snprintf(buff, sizeof(buff), "Hardware version");
-        }
-        else if (vib->vife[0] == 0x0E || vib->vife[0] == 0x8E)
-        {
-            // E000 1101
-            snprintf(buff, sizeof(buff), "Firmware version");
-        }
-        else if (vib->vife[0] == 0x0F || vib->vife[0] == 0x8F)
-        {
-            // E000 1101
-            snprintf(buff, sizeof(buff), "Software version");
-        }
-        else if (vib->vife[0] == 0x16)
-        {
-            // VIFE = E001 0110 Password
-            snprintf(buff, sizeof(buff), "Password");
-        }
-        else if (vib->vife[0] == 0x17 || vib->vife[0] == 0x97)
-        {
-            // VIFE = E001 0111 Error flags
-            snprintf(buff, sizeof(buff), "Error flags");
-        }
-        else if (vib->vife[0] == 0x10)
-        {
-            // VIFE = E001 0000 Customer location
-            snprintf(buff, sizeof(buff), "Customer location");
-        }
-        else if (vib->vife[0] == 0x11)
-        {
-            // VIFE = E001 0001 Customer
-            snprintf(buff, sizeof(buff), "Customer");
-        }
-        else if (vib->vife[0] == 0x1A)
-        {
-            // VIFE = E001 1010 Digital output (binary)
-            snprintf(buff, sizeof(buff), "Digital output (binary)");
-        }
-        else if (vib->vife[0] == 0x1B)
-        {
-            // VIFE = E001 1011 Digital input (binary)
-            snprintf(buff, sizeof(buff), "Digital input (binary)");
-        }
-        else if ((vib->vife[0] & 0x70) == 0x40)
-        {
-            // VIFE = E100 nnnn 10^(nnnn-9) V
-            n = (vib->vife[0] & 0x0F);
-            snprintf(buff, sizeof(buff), "%s V", mbus_unit_prefix(n-9));
-        }
-        else if ((vib->vife[0] & 0x70) == 0x50)
-        {
-            // VIFE = E101 nnnn 10nnnn-12 A
-            n = (vib->vife[0] & 0x0F);
-            snprintf(buff, sizeof(buff), "%s A", mbus_unit_prefix(n-12));
-        }
-        else if ((vib->vife[0] & 0xF0) == 0x70)
-        {
-            // VIFE = E111 nnn Reserved
-            snprintf(buff, sizeof(buff), "Reserved VIF extension");
-        }
-        else
+
+        return mbus_vib_unit_lookup_fb(vib);
+    }
+    else if (vib->vif == 0xFD) // first type of VIF extention: see table 8.4.4
+    {
+        if (vib->nvife == 0)
         {
-            snprintf(buff, sizeof(buff), "Unrecognized VIF extension: 0x%.2x", vib->vife[0]);
+            return "Missing VIF extension";
         }
-        return buff;
+
+        return mbus_vib_unit_lookup_fd(vib);
     }
     else if (vib->vif == 0x7C)
     {
diff --git a/test/test-frames/EMU_EMU-Professional-375-M-Bus.xml b/test/test-frames/EMU_EMU-Professional-375-M-Bus.xml
index 8b34fc2f..363ee2b4 100644
--- a/test/test-frames/EMU_EMU-Professional-375-M-Bus.xml
+++ b/test/test-frames/EMU_EMU-Professional-375-M-Bus.xml
@@ -241,7 +241,7 @@
     <DataRecord id="30">
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
-        <Unit>Unrecognized VIF extension: 0x60</Unit>
+        <Unit>Reset counter</Unit>
         <Value>56</Value>
     </DataRecord>
 
diff --git a/test/test-frames/LGB_G350.xml b/test/test-frames/LGB_G350.xml
index d75231c6..45ef288d 100644
--- a/test/test-frames/LGB_G350.xml
+++ b/test/test-frames/LGB_G350.xml
@@ -52,7 +52,7 @@
     <DataRecord id="5">
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
-        <Unit>Unrecognized VIF extension: 0x67</Unit>
+        <Unit>Special supplier information</Unit>
         <Value>15</Value>
     </DataRecord>
 

From 8d049910f7fd1fbe71c642a3fa3575c7d0ea3076 Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@hiq.se>
Date: Tue, 7 Jul 2020 14:44:35 +0200
Subject: [PATCH 09/29] Implement all of VIF extensions for 0xFB (#166)

---
 mbus/mbus-protocol.c                       | 245 ++++++++++++++++++++-
 test/test-frames/engelmann_sensostar2c.xml |  18 +-
 2 files changed, 253 insertions(+), 10 deletions(-)

diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
index 0d813a20..80eb45cc 100755
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@@ -2479,7 +2479,250 @@ static const char *
 mbus_vib_unit_lookup_fb(mbus_value_information_block *vib)
 {
     static char buff[256];
-    snprintf(buff, sizeof(buff), "Unrecognized VIF extension: 0xFB,0x%.2X", vib->vife[0]);
+    int n;
+    const char * prefix = "";
+    switch (vib->vife[0] & MBUS_DIB_VIF_WITHOUT_EXTENSION)
+    {
+        case 0x0:
+        case 0x0 + 1:
+            // E000 000n
+            n = 0x01 & vib->vife[0];
+            if (n == 0)
+                prefix = "0.1 ";
+        snprintf(buff, sizeof(buff), "Energy (%sMWh)", prefix);
+        break;
+    case 0x2:
+    case 0x2 + 1:
+        // E000 001n
+    case 0x4:
+    case 0x4 + 1:
+    case 0x4 + 2:
+    case 0x4 + 3:
+        // E000 01nn
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x8:
+    case 0x8 + 1:
+        // E000 100n
+        n = 0x01 & vib->vife[0];
+        if (n == 0)
+           prefix = "0.1 ";
+        snprintf(buff, sizeof(buff), "Energy (%sGJ)", prefix);
+        break;
+    case 0xA:
+    case 0xA + 1:
+    case 0xC:
+    case 0xC + 1:
+    case 0xC + 2:
+    case 0xC + 3:
+        // E000 101n
+        // E000 11nn
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x10:
+    case 0x10 + 1:
+        // E001 000n
+        n = 0x01 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Volume (%sm3)", mbus_unit_prefix(n+2));
+        break;
+    case 0x12:
+    case 0x12 + 1:
+    case 0x14:
+    case 0x14 + 1:
+    case 0x14 + 2:
+    case 0x14 + 3:
+        // E001 001n
+        // E001 01nn
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x18:
+    case 0x18 + 1:
+        // E001 100n
+        n = 0x01 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Mass (%st)", mbus_unit_prefix(n+2));
+        break;
+    case 0x1A:
+    case 0x1B:
+    case 0x1C:
+    case 0x1D:
+    case 0x1E:
+    case 0x1F:
+    case 0x20:
+        // E001 1010 to E010 0000, Reserved
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x21:
+        // E010 0001
+        snprintf(buff, sizeof(buff), "Volume (0.1 feet^3)");
+        break;
+    case 0x22:
+    case 0x23:
+        // E010 0010
+        // E010 0011
+        n = 0x01 & vib->vife[0];
+        if (n == 0)
+           prefix = "0.1 ";
+        snprintf(buff, sizeof(buff), "Volume (%samerican gallon)", prefix);
+        break;
+
+    case 0x24:
+        // E010 0100
+        snprintf(buff, sizeof(buff), "Volume flow (0.001 american gallon/min)");
+        break;
+    case 0x25:
+        // E010 0101
+        snprintf(buff, sizeof(buff), "Volume flow (american gallon/min)");
+        break;
+    case 0x26:
+        // E010 0110
+        snprintf(buff, sizeof(buff), "Volume flow (american gallon/h)");
+        break;
+    case 0x27:
+        // E010 0111, Reserved
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x28:
+    case 0x28 + 1:
+        // E010 100n
+        n = 0x01 & vib->vife[0];
+        if (n == 0)
+           prefix = "0.1 ";
+        snprintf(buff, sizeof(buff), "Power (%sMW)", prefix);
+        break;
+    case 0x2A:
+    case 0x2A + 1:
+    case 0x2C:
+    case 0x2C + 1:
+    case 0x2C + 2:
+    case 0x2C + 3:
+        // E010 101n, Reserved
+        // E010 11nn, Reserved
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x30:
+    case 0x30 + 1:
+        // E011 000n
+        n = 0x01 & vib->vife[0];
+        if (n == 0)
+           prefix = "0.1 ";
+        snprintf(buff, sizeof(buff), "Power (%sGJ/h)", prefix);
+        break;
+    case 0x32:
+    case 0x33:
+    case 0x34:
+    case 0x35:
+    case 0x36:
+    case 0x37:
+    case 0x38:
+    case 0x39:
+    case 0x3A:
+    case 0x3B:
+    case 0x3C:
+    case 0x3D:
+    case 0x3E:
+    case 0x3F:
+
+    case 0x40:
+    case 0x41:
+    case 0x42:
+    case 0x43:
+    case 0x44:
+    case 0x45:
+    case 0x46:
+    case 0x47:
+    case 0x48:
+    case 0x49:
+    case 0x4A:
+    case 0x4B:
+    case 0x4C:
+    case 0x4D:
+    case 0x4E:
+    case 0x4F:
+
+    case 0x52:
+    case 0x53:
+    case 0x54:
+    case 0x55:
+    case 0x56:
+    case 0x57:
+        // E011 0010 to E101 0111
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x58:
+    case 0x58 + 1:
+    case 0x58 + 2:
+    case 0x58 + 3:
+        // E101 10nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Flow Temperature (%s degree F)", mbus_unit_prefix(n -3));
+        break;
+    case 0x5C:
+    case 0x5C + 1:
+    case 0x5C + 2:
+    case 0x5C + 3:
+        // E101 11nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Return Temperature (%s degree F)", mbus_unit_prefix(n -3));
+        break;
+    case 0x60:
+    case 0x60 + 1:
+    case 0x60 + 2:
+    case 0x60 + 3:
+        // E110 00nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Temperature Difference (%s degree F)", mbus_unit_prefix(n -3));
+        break;
+    case 0x64:
+    case 0x64 + 1:
+    case 0x64 + 2:
+    case 0x64 + 3:
+        // E110 01nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "External Temperature (%s degree F)", mbus_unit_prefix(n -3));
+        break;
+    case 0x68:
+    case 0x69:
+    case 0x6A:
+    case 0x6B:
+    case 0x6C:
+    case 0x6D:
+    case 0x6E:
+    case 0x6F:
+        // E110 1nnn
+        snprintf(buff, sizeof(buff), "Reserved (0x%.2x)", vib->vife[0]);
+        break;
+    case 0x70:
+    case 0x70 + 1:
+    case 0x70 + 2:
+    case 0x70 + 3:
+        // E111 00nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Cold / Warm Temperature Limit (%s degree F)", mbus_unit_prefix(n -3));
+        break;
+    case 0x74:
+    case 0x74 + 1:
+    case 0x74 + 2:
+    case 0x74 + 3:
+        // E111 00nn
+        n = 0x03 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "Cold / Warm Temperature Limit (%s degree C)", mbus_unit_prefix(n -3));
+        break;
+    case 0x78:
+    case 0x78 + 1:
+    case 0x78 + 2:
+    case 0x78 + 3:
+    case 0x78 + 4:
+    case 0x78 + 5:
+    case 0x78 + 6:
+    case 0x78 + 7:
+        // E111 1nnn
+        n = 0x07 & vib->vife[0];
+        snprintf(buff, sizeof(buff), "cumul. count max power (%s W)", mbus_unit_prefix(n - 3));
+        break;
+    default:
+        snprintf(buff, sizeof(buff), "Unrecognized VIF 0xFB extension: 0x%.2x", vib->vife[0]);
+        break;
+    }
     return buff;
 }
 
diff --git a/test/test-frames/engelmann_sensostar2c.xml b/test/test-frames/engelmann_sensostar2c.xml
index c8476339..b33e52e8 100644
--- a/test/test-frames/engelmann_sensostar2c.xml
+++ b/test/test-frames/engelmann_sensostar2c.xml
@@ -36,7 +36,7 @@
     <DataRecord id="3">
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>8</Value>
     </DataRecord>
 
@@ -45,7 +45,7 @@
         <StorageNumber>0</StorageNumber>
         <Tariff>2</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 
@@ -54,7 +54,7 @@
         <StorageNumber>0</StorageNumber>
         <Tariff>3</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 
@@ -131,7 +131,7 @@
     <DataRecord id="16">
         <Function>Instantaneous value</Function>
         <StorageNumber>1</StorageNumber>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>8</Value>
     </DataRecord>
 
@@ -140,7 +140,7 @@
         <StorageNumber>1</StorageNumber>
         <Tariff>2</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 
@@ -149,7 +149,7 @@
         <StorageNumber>1</StorageNumber>
         <Tariff>3</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 
@@ -176,7 +176,7 @@
         <StorageNumber>2</StorageNumber>
         <Tariff>0</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>5</Value>
     </DataRecord>
 
@@ -185,7 +185,7 @@
         <StorageNumber>2</StorageNumber>
         <Tariff>2</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 
@@ -194,7 +194,7 @@
         <StorageNumber>2</StorageNumber>
         <Tariff>3</Tariff>
         <Device>0</Device>
-        <Unit>Unrecognized VIF extension: 0x00</Unit>
+        <Unit>Energy (0.1 MWh)</Unit>
         <Value>0</Value>
     </DataRecord>
 

From 36a4fbd02199fc53ea012ed9532850a276af9536 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Wed, 8 Jul 2020 11:44:17 +0200
Subject: [PATCH 10/29] Improve product strings for Aquametro and Sensus

---
 mbus/mbus-protocol.c                      | 28 +++++++++++++++--------
 test/test-frames/example_data_01.norm.xml |  2 +-
 test/test-frames/example_data_01.xml      |  2 +-
 test/test-frames/example_data_02.norm.xml |  2 +-
 test/test-frames/example_data_02.xml      |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
index 80eb45cc..93123644 100755
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@@ -955,14 +955,21 @@ mbus_data_product_name(mbus_data_variable_header *header)
         }
         else if (manufacturer == mbus_manufacturer_id("AMT"))
         {
-            switch (header->version)
+            if (header->version >= 0xC0)
             {
-                case 0x80:
-                    strcpy(buff,"Aquametro CALEC MB");
-                    break;
-                case 0xC0:
-                    strcpy(buff,"Aquametro CALEC ST");
-                    break;
+                strcpy(buff,"Aquametro CALEC ST");
+            }
+            else if (header->version >= 0x80)
+            {
+                strcpy(buff,"Aquametro CALEC MB");
+            }
+            else if (header->version >= 0x40)
+            {
+                strcpy(buff,"Aquametro SAPHIR");
+            }
+            else
+            {
+                strcpy(buff,"Aquametro AMTRON");
             }
         }
         else if (manufacturer == mbus_manufacturer_id("BEC"))
@@ -1266,15 +1273,16 @@ mbus_data_product_name(mbus_data_variable_header *header)
         {
             switch (header->version)
             {
+                case 0x08:
+                case 0x19:
+                    strcpy(buff,"Sensus PolluCom E");
+                    break;
                 case 0x0B:
                     strcpy(buff,"Sensus PolluTherm");
                     break;
                 case 0x0E:
                     strcpy(buff,"Sensus PolluStat E");
                     break;
-                case 0x19:
-                    strcpy(buff,"Sensus PolluCom E");
-                    break;
             }
         }
         else if (manufacturer == mbus_manufacturer_id("SON"))
diff --git a/test/test-frames/example_data_01.norm.xml b/test/test-frames/example_data_01.norm.xml
index 54ba0bb1..587ce57e 100644
--- a/test/test-frames/example_data_01.norm.xml
+++ b/test/test-frames/example_data_01.norm.xml
@@ -5,7 +5,7 @@
         <Id>3575845</Id>
         <Manufacturer>AMT</Manufacturer>
         <Version>52</Version>
-        <ProductName></ProductName>
+        <ProductName>Aquametro AMTRON</ProductName>
         <Medium>Heat: Outlet</Medium>
         <AccessNumber>158</AccessNumber>
         <Status>00</Status>
diff --git a/test/test-frames/example_data_01.xml b/test/test-frames/example_data_01.xml
index dbfede82..a344e785 100644
--- a/test/test-frames/example_data_01.xml
+++ b/test/test-frames/example_data_01.xml
@@ -5,7 +5,7 @@
         <Id>3575845</Id>
         <Manufacturer>AMT</Manufacturer>
         <Version>52</Version>
-        <ProductName></ProductName>
+        <ProductName>Aquametro AMTRON</ProductName>
         <Medium>Heat: Outlet</Medium>
         <AccessNumber>158</AccessNumber>
         <Status>00</Status>
diff --git a/test/test-frames/example_data_02.norm.xml b/test/test-frames/example_data_02.norm.xml
index d135aae2..87022161 100644
--- a/test/test-frames/example_data_02.norm.xml
+++ b/test/test-frames/example_data_02.norm.xml
@@ -5,7 +5,7 @@
         <Id>3575845</Id>
         <Manufacturer>AMT</Manufacturer>
         <Version>52</Version>
-        <ProductName></ProductName>
+        <ProductName>Aquametro AMTRON</ProductName>
         <Medium>Heat: Outlet</Medium>
         <AccessNumber>161</AccessNumber>
         <Status>00</Status>
diff --git a/test/test-frames/example_data_02.xml b/test/test-frames/example_data_02.xml
index ad6236fc..fda38dfc 100644
--- a/test/test-frames/example_data_02.xml
+++ b/test/test-frames/example_data_02.xml
@@ -5,7 +5,7 @@
         <Id>3575845</Id>
         <Manufacturer>AMT</Manufacturer>
         <Version>52</Version>
-        <ProductName></ProductName>
+        <ProductName>Aquametro AMTRON</ProductName>
         <Medium>Heat: Outlet</Medium>
         <AccessNumber>161</AccessNumber>
         <Status>00</Status>

From 7b10dc2fd4d1cf33bb6c008dec3c182567276e64 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Wed, 8 Jul 2020 11:47:54 +0200
Subject: [PATCH 11/29] Add more test frames

Aquametro CALEC MB (Heat)
Eastron SDM630 (Electricity)
Sensus PolluCom E (Heat)
Tecson (Oil)
---
 test/test-frames/amt_calec_mb.hex        |   1 +
 test/test-frames/amt_calec_mb.norm.xml   |  71 ++++++++
 test/test-frames/amt_calec_mb.xml        |  64 ++++++++
 test/test-frames/eastron_sdm630.hex      |   1 +
 test/test-frames/eastron_sdm630.norm.xml | 199 +++++++++++++++++++++++
 test/test-frames/eastron_sdm630.xml      | 176 ++++++++++++++++++++
 test/test-frames/sen_pollucom_e.hex      |   1 +
 test/test-frames/sen_pollucom_e.norm.xml |  95 +++++++++++
 test/test-frames/sen_pollucom_e.xml      |  83 ++++++++++
 test/test-frames/tecson.hex              |   1 +
 test/test-frames/tecson.norm.xml         |  41 +++++
 test/test-frames/tecson.xml              |  38 +++++
 12 files changed, 771 insertions(+)
 create mode 100644 test/test-frames/amt_calec_mb.hex
 create mode 100644 test/test-frames/amt_calec_mb.norm.xml
 create mode 100644 test/test-frames/amt_calec_mb.xml
 create mode 100644 test/test-frames/eastron_sdm630.hex
 create mode 100644 test/test-frames/eastron_sdm630.norm.xml
 create mode 100644 test/test-frames/eastron_sdm630.xml
 create mode 100644 test/test-frames/sen_pollucom_e.hex
 create mode 100644 test/test-frames/sen_pollucom_e.norm.xml
 create mode 100644 test/test-frames/sen_pollucom_e.xml
 create mode 100644 test/test-frames/tecson.hex
 create mode 100644 test/test-frames/tecson.norm.xml
 create mode 100644 test/test-frames/tecson.xml

diff --git a/test/test-frames/amt_calec_mb.hex b/test/test-frames/amt_calec_mb.hex
new file mode 100644
index 00000000..942b40d0
--- /dev/null
+++ b/test/test-frames/amt_calec_mb.hex
@@ -0,0 +1 @@
+68 38 38 68 08 C8 72 09 31 54 03 B4 05 B0 04 C9 10 FF FF 03 22 9A 00 00 05 2E A0 C8 51 46 05 3E B4 E3 D7 42 05 5B 90 D3 07 43 05 5F 0E AA E7 41 05 63 9C BC D5 42 04 6D 10 09 05 C5 77 16
diff --git a/test/test-frames/amt_calec_mb.norm.xml b/test/test-frames/amt_calec_mb.norm.xml
new file mode 100644
index 00000000..4eef3de4
--- /dev/null
+++ b/test/test-frames/amt_calec_mb.norm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>3543109</Id>
+        <Manufacturer>AMT</Manufacturer>
+        <Version>176</Version>
+        <ProductName>Aquametro CALEC MB</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>201</AccessNumber>
+        <Status>10</Status>
+        <Signature>FFFF</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>s</Unit>
+        <Quantity>On time</Quantity>
+        <Value>554400.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>13426156.250000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>107.944733</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>135.826416</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>28.958035</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>106.868378</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>-</Unit>
+        <Quantity>Time point (date &amp; time)</Quantity>
+        <Value>2096-05-05T09:16:00Z</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/amt_calec_mb.xml b/test/test-frames/amt_calec_mb.xml
new file mode 100644
index 00000000..6e4ab730
--- /dev/null
+++ b/test/test-frames/amt_calec_mb.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>3543109</Id>
+        <Manufacturer>AMT</Manufacturer>
+        <Version>176</Version>
+        <ProductName>Aquametro CALEC MB</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>201</AccessNumber>
+        <Status>10</Status>
+        <Signature>FFFF</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>On time (hours)</Unit>
+        <Value>154</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (kW)</Unit>
+        <Value>13426.156250</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Volume flow ( m^3/h)</Unit>
+        <Value>107.944733</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Flow temperature (deg C)</Unit>
+        <Value>135.826416</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Return temperature (deg C)</Unit>
+        <Value>28.958035</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Temperature Difference ( deg C)</Unit>
+        <Value>106.868378</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Time Point (time &amp; date)</Unit>
+        <Value>2096-05-05T09:16:00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/eastron_sdm630.hex b/test/test-frames/eastron_sdm630.hex
new file mode 100644
index 00000000..5666f2e1
--- /dev/null
+++ b/test/test-frames/eastron_sdm630.hex
@@ -0,0 +1 @@
+68 90 90 68 08 0A 72 78 65 34 21 24 40 01 02 55 00 00 00 0B FD 47 56 34 12 0B FD 47 56 34 12 0B FD 47 56 34 12 0B FD 47 56 34 12 0B FD 47 56 34 12 0B FD 47 56 34 12 0B FD 59 56 34 12 0B FD 59 56 34 12 0B FD 59 56 34 12 0B FD 59 56 34 12 0B 2A 56 34 12 0B 2A 56 34 12 0B 2A 56 34 12 0B 2A 56 34 12 0B FD 3A 56 34 12 0B FD 3A 56 34 12 0B FD 3A 56 34 12 0B FD 3A 56 34 12 0A FD 3A 00 05 0A FD 3A 05 00 0A FD 3A 05 00 0A FD 3A 05 00 0A FD 3A 50 00 4D 16
diff --git a/test/test-frames/eastron_sdm630.norm.xml b/test/test-frames/eastron_sdm630.norm.xml
new file mode 100644
index 00000000..f3fbbeb1
--- /dev/null
+++ b/test/test-frames/eastron_sdm630.norm.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>21346578</Id>
+        <Manufacturer>PAD</Manufacturer>
+        <Version>1</Version>
+        <ProductName></ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>85</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>V</Unit>
+        <Quantity>Voltage</Quantity>
+        <Value>1234.560000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>123.456000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>123.456000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>123.456000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>A</Unit>
+        <Quantity>Current</Quantity>
+        <Value>123.456000</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>12345.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>12345.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>12345.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>12345.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>123456.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>123456.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>123456.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>123456.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>500.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>5.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>5.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>5.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Dimensionless</Quantity>
+        <Value>50.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/eastron_sdm630.xml b/test/test-frames/eastron_sdm630.xml
new file mode 100644
index 00000000..2de43526
--- /dev/null
+++ b/test/test-frames/eastron_sdm630.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>21346578</Id>
+        <Manufacturer>PAD</Manufacturer>
+        <Version>1</Version>
+        <ProductName></ProductName>
+        <Medium>Electricity</Medium>
+        <AccessNumber>85</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>1e-2  V</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m A</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m A</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m A</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m A</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="10">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (1e-1 W)</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="11">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (1e-1 W)</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="12">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (1e-1 W)</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="13">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (1e-1 W)</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="14">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="15">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="16">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="17">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>123456</Value>
+    </DataRecord>
+
+    <DataRecord id="18">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>500</Value>
+    </DataRecord>
+
+    <DataRecord id="19">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>5</Value>
+    </DataRecord>
+
+    <DataRecord id="20">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>5</Value>
+    </DataRecord>
+
+    <DataRecord id="21">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>5</Value>
+    </DataRecord>
+
+    <DataRecord id="22">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>dimensionless / no VIF</Unit>
+        <Value>50</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/sen_pollucom_e.hex b/test/test-frames/sen_pollucom_e.hex
new file mode 100644
index 00000000..76f0a877
--- /dev/null
+++ b/test/test-frames/sen_pollucom_e.hex
@@ -0,0 +1 @@
+68 42 42 68 08 00 72 45 00 94 63 AE 4C 08 04 F9 00 00 00 0C 06 19 90 01 00 0C 13 19 11 62 01 0C 3B 00 00 00 00 0C 2B 00 00 00 00 02 5A 67 01 02 5E E9 00 03 60 46 31 00 0C 78 45 00 94 63 0C FD 10 45 00 94 63 1F B6 16
diff --git a/test/test-frames/sen_pollucom_e.norm.xml b/test/test-frames/sen_pollucom_e.norm.xml
new file mode 100644
index 00000000..1c79a730
--- /dev/null
+++ b/test/test-frames/sen_pollucom_e.norm.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>63940045</Id>
+        <Manufacturer>SEN</Manufacturer>
+        <Version>8</Version>
+        <ProductName>Sensus PolluCom E</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>249</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Wh</Unit>
+        <Quantity>Energy</Quantity>
+        <Value>19019000.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>1621.119000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3/h</Unit>
+        <Quantity>Volume flow</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>W</Unit>
+        <Quantity>Power</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Flow temperature</Quantity>
+        <Value>35.900000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>Return temperature</Quantity>
+        <Value>23.300000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>K</Unit>
+        <Quantity>Temperature difference</Quantity>
+        <Value>12.614000</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>63940045.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Customer location</Quantity>
+        <Value>63940045.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/sen_pollucom_e.xml b/test/test-frames/sen_pollucom_e.xml
new file mode 100644
index 00000000..1c3653bb
--- /dev/null
+++ b/test/test-frames/sen_pollucom_e.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>63940045</Id>
+        <Manufacturer>SEN</Manufacturer>
+        <Version>8</Version>
+        <ProductName>Sensus PolluCom E</ProductName>
+        <Medium>Heat: Outlet</Medium>
+        <AccessNumber>249</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Energy (kWh)</Unit>
+        <Value>19019</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Volume (m m^3)</Unit>
+        <Value>1621119</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Volume flow (m m^3/h)</Unit>
+        <Value>0</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Power (W)</Unit>
+        <Value>0</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Flow temperature (1e-1 deg C)</Unit>
+        <Value>359</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Return temperature (1e-1 deg C)</Unit>
+        <Value>233</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Temperature Difference (m deg C)</Unit>
+        <Value>12614</Value>
+    </DataRecord>
+
+    <DataRecord id="7">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Fabrication number</Unit>
+        <Value>63940045</Value>
+    </DataRecord>
+
+    <DataRecord id="8">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Customer location</Unit>
+        <Value>63940045</Value>
+    </DataRecord>
+
+    <DataRecord id="9">
+        <Function>More records follow</Function>
+        <Value></Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/tecson.hex b/test/test-frames/tecson.hex
new file mode 100644
index 00000000..2f082269
--- /dev/null
+++ b/test/test-frames/tecson.hex
@@ -0,0 +1 @@
+68 1B 1B 68 08 00 72 12 34 56 78 A3 50 10 01 01 00 00 00 01 67 09 0A 14 60 45 92 10 14 88 13 18 16
diff --git a/test/test-frames/tecson.norm.xml b/test/test-frames/tecson.norm.xml
new file mode 100644
index 00000000..3d04e662
--- /dev/null
+++ b/test/test-frames/tecson.norm.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>78563412</Id>
+        <Manufacturer>TEC</Manufacturer>
+        <Version>16</Version>
+        <ProductName></ProductName>
+        <Medium>Oil</Medium>
+        <AccessNumber>1</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>°C</Unit>
+        <Quantity>External temperature</Quantity>
+        <Value>9.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>45.600000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>m^3</Unit>
+        <Quantity>Volume</Quantity>
+        <Value>50.000000</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/tecson.xml b/test/test-frames/tecson.xml
new file mode 100644
index 00000000..201cdfd4
--- /dev/null
+++ b/test/test-frames/tecson.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>78563412</Id>
+        <Manufacturer>TEC</Manufacturer>
+        <Version>16</Version>
+        <ProductName></ProductName>
+        <Medium>Oil</Medium>
+        <AccessNumber>1</AccessNumber>
+        <Status>00</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>External temperature ( deg C)</Unit>
+        <Value>9</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Volume (1e-2  m^3)</Unit>
+        <Value>4560</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Maximum value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>1</Tariff>
+        <Device>0</Device>
+        <Unit>Volume (1e-2  m^3)</Unit>
+        <Value>5000</Value>
+    </DataRecord>
+
+</MBusData>

From be23bda7a2bbbd9f8e4644510b86b5721143cced Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Wed, 8 Jul 2020 12:30:22 +0200
Subject: [PATCH 12/29] Remove duplicate

rvd235.hex is the same as siemens_rvd235.hex
---
 test/unsupported-frames/rvd235.hex | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test/unsupported-frames/rvd235.hex

diff --git a/test/unsupported-frames/rvd235.hex b/test/unsupported-frames/rvd235.hex
deleted file mode 100644
index 113ab5f4..00000000
--- a/test/unsupported-frames/rvd235.hex
+++ /dev/null
@@ -1 +0,0 @@
-68 96 96 68 08 00 72 04 11 29 00 7A 32 29 20 0C 28 00 00 0C 78 20 71 04 00 06 FD 0C FC 03 6D 00 2D 00 0D FD 0B 06 35 33 32 44 56 52 81 30 FD 7C 01 81 20 FD 7C 00 01 FD 7C 00 0F 02 78 04 00 02 7A 04 00 32 00 1E 09 32 08 00 00 34 10 00 00 00 00 31 18 00 34 18 FF FF FF FF 71 18 00 74 18 FF FF FF FF B1 01 18 00 B4 01 18 FF FF FF FF F1 01 18 00 F4 01 18 FF FF FF FF B1 02 18 00 B4 02 18 FF FF FF FF F1 02 18 00 31 28 00 34 28 FF FF FF FF 71 28 00 01 01 00 01 09 00 24 16

From 647cedefe3eaf31789d87e04c8a79880a1e8d203 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Wed, 8 Jul 2020 12:34:38 +0200
Subject: [PATCH 13/29] Move RVD235 out of unsupported

Especially after the recent changes, we can consider Siemens RVD235 as
supported.
---
 .../siemens_rvd235.hex                        |  0
 test/test-frames/siemens_rvd235.norm.xml      | 75 +++++++++++++++++++
 test/test-frames/siemens_rvd235.xml           | 66 ++++++++++++++++
 3 files changed, 141 insertions(+)
 rename test/{unsupported-frames => test-frames}/siemens_rvd235.hex (100%)
 create mode 100644 test/test-frames/siemens_rvd235.norm.xml
 create mode 100644 test/test-frames/siemens_rvd235.xml

diff --git a/test/unsupported-frames/siemens_rvd235.hex b/test/test-frames/siemens_rvd235.hex
similarity index 100%
rename from test/unsupported-frames/siemens_rvd235.hex
rename to test/test-frames/siemens_rvd235.hex
diff --git a/test/test-frames/siemens_rvd235.norm.xml b/test/test-frames/siemens_rvd235.norm.xml
new file mode 100644
index 00000000..c9105b8d
--- /dev/null
+++ b/test/test-frames/siemens_rvd235.norm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>291104</Id>
+        <Manufacturer>LSZ</Manufacturer>
+        <Version>41</Version>
+        <ProductName></ProductName>
+        <Medium>Breaker: Electricity</Medium>
+        <AccessNumber>12</AccessNumber>
+        <Status>28</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Fabrication No</Quantity>
+        <Value>47120.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Model / Version</Quantity>
+        <Value>193280672764.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity>Parameter set identification</Quantity>
+        <Value>RVD235</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Reserved</Unit>
+        <Quantity>Reserved</Quantity>
+        <Value>1.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Reserved</Unit>
+        <Quantity>Reserved</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Reserved</Unit>
+        <Quantity>Reserved</Quantity>
+        <Value>0.000000</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Manufacturer specific</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit></Unit>
+        <Quantity></Quantity>
+        <Value>02 78 04 00 02 7A 04 00 32 00 1E 09 32 08 00 00 34 10 00 00 00 00 31 18 00 34 18 FF FF FF FF 71 18 00 74 18 FF FF FF FF B1 01 18 00 B4 01 18 FF FF FF FF F1 01 18 00 F4 01 18 FF FF FF FF B1 02 18 00 B4 02 18 FF FF FF FF F1 02 18 00 31 28 00 34 28 FF FF FF FF 71 28 00 01 01 00 01 09 00</Value>
+    </DataRecord>
+
+</MBusData>
diff --git a/test/test-frames/siemens_rvd235.xml b/test/test-frames/siemens_rvd235.xml
new file mode 100644
index 00000000..3b570d37
--- /dev/null
+++ b/test/test-frames/siemens_rvd235.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<MBusData>
+
+    <SlaveInformation>
+        <Id>291104</Id>
+        <Manufacturer>LSZ</Manufacturer>
+        <Version>41</Version>
+        <ProductName></ProductName>
+        <Medium>Breaker: Electricity</Medium>
+        <AccessNumber>12</AccessNumber>
+        <Status>28</Status>
+        <Signature>0000</Signature>
+    </SlaveInformation>
+
+    <DataRecord id="0">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Fabrication number</Unit>
+        <Value>47120</Value>
+    </DataRecord>
+
+    <DataRecord id="1">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Model / Version</Unit>
+        <Value>193280672764</Value>
+    </DataRecord>
+
+    <DataRecord id="2">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Parameter set identification</Unit>
+        <Value>RVD235</Value>
+    </DataRecord>
+
+    <DataRecord id="3">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>3</Tariff>
+        <Device>0</Device>
+        <Unit>Reserved VIF extension</Unit>
+        <Value>1</Value>
+    </DataRecord>
+
+    <DataRecord id="4">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Tariff>2</Tariff>
+        <Device>0</Device>
+        <Unit>Reserved VIF extension</Unit>
+        <Value>0</Value>
+    </DataRecord>
+
+    <DataRecord id="5">
+        <Function>Instantaneous value</Function>
+        <StorageNumber>0</StorageNumber>
+        <Unit>Reserved VIF extension</Unit>
+        <Value>0</Value>
+    </DataRecord>
+
+    <DataRecord id="6">
+        <Function>Manufacturer specific</Function>
+        <Value>02 78 04 00 02 7A 04 00 32 00 1E 09 32 08 00 00 34 10 00 00 00 00 31 18 00 34 18 FF FF FF FF 71 18 00 74 18 FF FF FF FF B1 01 18 00 B4 01 18 FF FF FF FF F1 01 18 00 F4 01 18 FF FF FF FF B1 02 18 00 B4 02 18 FF FF FF FF F1 02 18 00 31 28 00 34 28 FF FF FF FF 71 28 00 01 01 00 01 09 00</Value>
+    </DataRecord>
+
+</MBusData>

From db42619e0e7454da84ff76321358edba05c8642d Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@hiq.se>
Date: Tue, 7 Jul 2020 15:40:23 +0200
Subject: [PATCH 14/29] Move invalid_length*.hex to test/unsupported-frames
 (#165)

---
 test/{test-frames => unsupported-frames}/invalid_length.hex  | 0
 test/{test-frames => unsupported-frames}/invalid_length2.hex | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename test/{test-frames => unsupported-frames}/invalid_length.hex (100%)
 rename test/{test-frames => unsupported-frames}/invalid_length2.hex (100%)

diff --git a/test/test-frames/invalid_length.hex b/test/unsupported-frames/invalid_length.hex
similarity index 100%
rename from test/test-frames/invalid_length.hex
rename to test/unsupported-frames/invalid_length.hex
diff --git a/test/test-frames/invalid_length2.hex b/test/unsupported-frames/invalid_length2.hex
similarity index 100%
rename from test/test-frames/invalid_length2.hex
rename to test/unsupported-frames/invalid_length2.hex

From 2dc6c6b1f98ac10ddbc224d9704eeae9296fc4fa Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@hiq.se>
Date: Wed, 1 Jul 2020 12:36:45 +0200
Subject: [PATCH 15/29] Enforce tests execute ok (#165)

---
 .github/workflows/ccpp.yml |  6 +++++-
 .travis.yml                |  2 ++
 test/generate-xml.sh       | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 1478bc32..53147de9 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -12,7 +12,11 @@ jobs:
       run: rm -rf build || true && mkdir build && cd build && cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && cmake --build . -j && cd ..
 
     - name: generate test frames
-      run: ./test/generate-xml.sh test/test-frames
+      run: |
+        ./test/generate-xml.sh test/test-frames
+        echo "NOTE: error-frames have about 30 parse errors, and unsupported-frames have 12"
+        ./test/generate-xml.sh test/error-frames || true
+        ./test/generate-xml.sh test/unsupported-frames || true
 
     - name: install and run gcovr
       run: sudo pip install gcovr && gcovr build/.
diff --git a/.travis.yml b/.travis.yml
index 39fe165c..70b00795 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,3 +11,5 @@ os:
 script: 
   - ./build.sh
   - cd test && make && ./generate-xml.sh test-frames
+  - cd test && make && ./generate-xml.sh test/error-frames || true
+  - cd test && make && ./generate-xml.sh test/unsupported-frames || true
diff --git a/test/generate-xml.sh b/test/generate-xml.sh
index b9662d93..b504fad0 100755
--- a/test/generate-xml.sh
+++ b/test/generate-xml.sh
@@ -12,6 +12,12 @@
 #
 #------------------------------------------------------------------------------
 
+NUMBER_OF_PARSING_ERRORS=0
+FAILING_TESTS=failing_tests.txt
+NEW_TESTS=new_tests.txt
+touch $FAILING_TESTS
+touch $NEW_TESTS
+
 # Check commandline parameter
 if [ $# -ne 1 ]; then
     echo "usage: $0 path_to_directory_with_xml_files"
@@ -64,6 +70,7 @@ generate_xml() {
 
     # Check parsing result
     if [ $result -ne 0 ]; then
+        NUMBER_OF_PARSING_ERRORS=$((NUMBER_OF_PARSING_ERRORS + 1))
         echo "Unable to generate XML for $hexfile"
         rm "$directory/$filename$mode.xml.new"
         return 1
@@ -81,14 +88,17 @@ generate_xml() {
              ;;
         1)
              # different -> print diff
+             echo "== $directory/$filename$mode failed"
              cat "$directory/$filename$mode.dif" && rm "$directory/$filename$mode.dif"
              echo ""
+             echo "$filename$mode" >> $FAILING_TESTS
              ;;
         *)
              # no old -> rename XML
              echo "Create $filename$mode.xml"
              mv "$directory/$filename$mode.xml.new" "$directory/$filename$mode.xml"
              rm "$directory/$filename$mode.dif"
+             echo "$filename$mode" >> $NEW_TESTS
              ;;
     esac
 
@@ -105,3 +115,27 @@ for hexfile in "$directory"/*.hex;  do
     generate_xml "$directory" "$hexfile" "normalized"
 done
 
+# Check the size of the file $FAILING_TESTS. Make sure to indicate failure.
+if [ -s $FAILING_TESTS ]; then
+    echo "** There were errors in the following file(s):"
+    cat $FAILING_TESTS
+    exit 1
+else
+    rm $FAILING_TESTS
+fi
+if [ -s $NEW_TESTS ]; then
+    echo "** There were new test in the following file(s):"
+    cat $NEW_TESTS
+else
+    rm $NEW_TESTS
+fi
+
+# Check that there was no files that failed to parse
+if [ $NUMBER_OF_PARSING_ERRORS -ne 0 ]; then
+    echo "** There were $NUMBER_OF_PARSING_ERRORS files that did not parse, expected 0 files."
+    echo
+    exit $NUMBER_OF_PARSING_ERRORS
+fi
+DIRECTORY_BASENAME="$(basename "$directory")"
+echo "** Tests executed successfully in \"$DIRECTORY_BASENAME\"."
+echo

From 8ab5d9ebd003f1ebd5a8d38b889b965672d25c08 Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@hiq.se>
Date: Wed, 1 Jul 2020 12:53:50 +0200
Subject: [PATCH 16/29] Fix bug, test script should accept both 1 and 2
 arguments (#165)

Usefull when placing the output in another directory.
---
 test/generate-xml.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/generate-xml.sh b/test/generate-xml.sh
index b504fad0..f6c79ff7 100755
--- a/test/generate-xml.sh
+++ b/test/generate-xml.sh
@@ -19,7 +19,7 @@ touch $FAILING_TESTS
 touch $NEW_TESTS
 
 # Check commandline parameter
-if [ $# -ne 1 ]; then
+if [ $# -lt 1 ] || [ $# -gt 2 ]; then
     echo "usage: $0 path_to_directory_with_xml_files"
     echo "or"
     echo "usage: $0 path_to_directory_with_xml_files path_to_mbus_parse_hex_with_filename"

From 48c03109d742a3cc49d2ad65510066ba545487c9 Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@hiq.se>
Date: Wed, 1 Jul 2020 13:05:31 +0200
Subject: [PATCH 17/29] Rewrite ccpp.yml to use multi-line command (#165)

For enhanced readability, split the commands over several lines.
---
 .github/workflows/ccpp.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 53147de9..df0398ab 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -9,7 +9,12 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: build examples and tests
-      run: rm -rf build || true && mkdir build && cd build && cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && cmake --build . -j && cd ..
+      run: |
+        rm -rf build || true
+        mkdir -p build
+        cd build
+        cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && cmake --build . -j
+        cd ..
 
     - name: generate test frames
       run: |
@@ -27,7 +32,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: build debian package
-      run: rm -rf build || true && mkdir build && cd build && cmake .. -DLIBMBUS_PACKAGE_DEB=ON && cpack .. && sudo dpkg -i *.deb && ls /usr/lib
+      run: |
+        rm -rf build || true
+        mkdir -p build
+        cd build
+        cmake .. -DLIBMBUS_PACKAGE_DEB=ON
+        cpack ..
+        sudo dpkg -i *.deb
+        ls /usr/lib
 
   doc:
     runs-on: ubuntu-latest
@@ -38,5 +50,9 @@ jobs:
       run: sudo apt install -y doxygen
       
     - name: build doxygen documentation
-      run: rm -rf build || true && mkdir build && cd build && cmake .. -DLIBMBUS_BUILD_DOCS=ON && cmake --build . --target doc
-
+      run: |
+        rm -rf build || true
+        mkdir build
+        cd build
+        cmake .. -DLIBMBUS_BUILD_DOCS=ON
+        cmake --build . --target doc

From c8940fa267c816a57d79e5eb7b05836d3d4829d8 Mon Sep 17 00:00:00 2001
From: Fredrik Skold <fredrik.skold@gmail.com>
Date: Thu, 4 Jun 2020 16:11:52 +0200
Subject: [PATCH 18/29] Add Dockerfile.test to run tests from docker (#165)

---
 Dockerfile.test | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 Dockerfile.test

diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 00000000..52ee1792
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,18 @@
+# docker build . -f Dockerfile.test -t test_builder
+
+FROM ubuntu
+
+RUN apt update -y && apt install -y cmake gcc g++ make
+COPY . /tmp
+RUN cd /tmp && \
+    mkdir build && \
+    cd build && \
+    cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && \
+    cmake --build . -j && \
+    cd .. && \
+    ./test/generate-xml.sh test/test-frames
+
+RUN cd /tmp && \
+    echo "NOTE: error-frames have about 30 parse errors, and unsupported-frames have 12" && \
+    ./test/generate-xml.sh test/error-frames || true ; \
+    ./test/generate-xml.sh test/unsupported-frames || true

From 0b4ada12d4a42d2cbdecd557a5cfdd5e7251525c Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Sun, 19 Jul 2020 12:53:59 +0200
Subject: [PATCH 19/29] build: temporary revert to autotools (#174)

As long as cmake doesn't generate suitable deb packages, we need to
switch back :(
---
 .github/workflows/ccpp.yml |  58 --------
 CMakeLists.txt             | 296 -------------------------------------
 Dockerfile.deb             |  14 --
 Dockerfile.rpm             |  14 --
 Dockerfile.test            |  18 ---
 Makefile-static            |  25 ++++
 Makefile.am                |  20 +++
 README.md                  |  32 +---
 bin/CMakeLists.txt         |  19 ---
 bin/Makefile-static        |  24 +++
 bin/Makefile.am            | 102 +++++++++++++
 build-deb.sh               |  25 ++++
 build.sh                   |  37 +++--
 cmake-format.yaml          |  15 --
 cmake/Config.cmake.in      |   4 -
 configure.ac               |  44 ++++++
 Doxyfile.in => doxygen.cfg |   9 +-
 libmbus.pc.in              |  12 +-
 libmbus.spec               |  87 +++++++++++
 mbus/Makefile.am           |  20 +++
 mbus/config.h.in           |  56 -------
 test/CMakeLists.txt        |   5 -
 test/Makefile.am           |  25 ++++
 23 files changed, 399 insertions(+), 562 deletions(-)
 delete mode 100644 .github/workflows/ccpp.yml
 delete mode 100644 CMakeLists.txt
 delete mode 100644 Dockerfile.deb
 delete mode 100644 Dockerfile.rpm
 delete mode 100644 Dockerfile.test
 create mode 100644 Makefile-static
 create mode 100644 Makefile.am
 delete mode 100644 bin/CMakeLists.txt
 create mode 100644 bin/Makefile-static
 create mode 100644 bin/Makefile.am
 create mode 100755 build-deb.sh
 delete mode 100644 cmake-format.yaml
 delete mode 100644 cmake/Config.cmake.in
 create mode 100644 configure.ac
 rename Doxyfile.in => doxygen.cfg (99%)
 create mode 100644 libmbus.spec
 create mode 100644 mbus/Makefile.am
 delete mode 100644 mbus/config.h.in
 delete mode 100644 test/CMakeLists.txt
 create mode 100644 test/Makefile.am

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
deleted file mode 100644
index df0398ab..00000000
--- a/.github/workflows/ccpp.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: CMake
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v2
-    - name: build examples and tests
-      run: |
-        rm -rf build || true
-        mkdir -p build
-        cd build
-        cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && cmake --build . -j
-        cd ..
-
-    - name: generate test frames
-      run: |
-        ./test/generate-xml.sh test/test-frames
-        echo "NOTE: error-frames have about 30 parse errors, and unsupported-frames have 12"
-        ./test/generate-xml.sh test/error-frames || true
-        ./test/generate-xml.sh test/unsupported-frames || true
-
-    - name: install and run gcovr
-      run: sudo pip install gcovr && gcovr build/.
-
-  debian:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v2
-    - name: build debian package
-      run: |
-        rm -rf build || true
-        mkdir -p build
-        cd build
-        cmake .. -DLIBMBUS_PACKAGE_DEB=ON
-        cpack ..
-        sudo dpkg -i *.deb
-        ls /usr/lib
-
-  doc:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: build doxygen documentation
-      run: sudo apt install -y doxygen
-      
-    - name: build doxygen documentation
-      run: |
-        rm -rf build || true
-        mkdir build
-        cd build
-        cmake .. -DLIBMBUS_BUILD_DOCS=ON
-        cmake --build . --target doc
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index c47a94c3..00000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-project(
-  libmbus
-  LANGUAGES CXX C
-  VERSION "0.9.0")
-
-if(CMAKE_BUILD_TYPE STREQUAL "")
-  message(STATUS "CMAKE_BUILD_TYPE empty setting to Debug")
-  set(CMAKE_BUILD_TYPE "Debug")
-endif()
-
-# ##############################################################################
-# default options -> changed with e.g. cd build && cmake ..
-# -DLIBMBUS_BUILD_TESTS=ON
-# ##############################################################################
-
-option(LIBMBUS_BUILD_EXAMPLES "build examples" OFF)
-option(LIBMBUS_BUILD_TESTS "build tests" OFF)
-option(LIBMBUS_ENABLE_COVERAGE "build with coverage support" OFF)
-option(LIBMBUS_RUN_CLANG_TIDY "use Clang-Tidy for static analysis" OFF)
-option(LIBMBUS_PACKAGE_DEB "build debian package" OFF)
-option(LIBMBUS_PACKAGE_RPM "build rpm package" OFF)
-option(LIBMBUS_BUILD_DOCS "build documentation" OFF)
-option(BUILD_SHARED_LIBS "build shared lib" ON)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_C_STANDARD 11)
-
-# Append our module directory to CMake
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_BINARY_DIR}")
-
-# Set the output of the libraries and executables.
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-
-# ##############################################################################
-# static analysis
-# ##############################################################################
-
-if(LIBMBUS_RUN_CLANG_TIDY)
-  find_program(
-    CLANG_TIDY_EXE
-    NAMES "clang-tidy"
-    DOC "/usr/bin/clang-tidy")
-  if(NOT CLANG_TIDY_EXE)
-    message(WARNING "clang-tidy not found.")
-  else()
-    message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
-  endif()
-endif(LIBMBUS_RUN_CLANG_TIDY)
-
-if(LIBMBUS_ENABLE_COVERAGE)
-  if(NOT CMAKE_BUILD_TYPE MATCHES "(Debug)|(RelWithDebInfo)")
-    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
-  endif()
-
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    # using Clang
-    message(STATUS "Not doing coverage...")
-  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    # using GCC
-    message(STATUS "Building with code coverage...")
-    set(CMAKE_BUILD_TYPE DEBUG)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -ggdb3 -O0 --coverage -fprofile-arcs -ftest-coverage")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -ggdb3 -O0 --coverage -fprofile-arcs -ftest-coverage ")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fprofile-arcs -ftest-coverage ")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fprofile-arcs -ftest-coverage ")
-    link_libraries(-lgcov)
-  endif()
-endif()
-
-include(CheckIncludeFile)
-
-check_include_file(dlfcn.h HAVE_DLFCN_H)
-check_include_file(inttypes.h HAVE_INTTYPES_H)
-check_include_file(memory.h HAVE_MEMORY_H)
-check_include_file(stdlib.h HAVE_STDINT_H)
-check_include_file(stdint.h HAVE_STDLIB_H)
-check_include_file(strings.h HAVE_STRINGS_H)
-check_include_file(string.h HAVE_STRING_H)
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(unistd.h HAVE_UNISTD_H)
-
-# ##############################################################################
-# library
-# ##############################################################################
-
-set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
-
-set(PACKAGE_VERSION "${PROJECT_VERSION}")
-set(VERSION "${PROJECT_VERSION}")
-configure_file(${CMAKE_CURRENT_LIST_DIR}/mbus/config.h.in ${CMAKE_CURRENT_LIST_DIR}/config.h @ONLY)
-
-add_library(
-  ${PROJECT_NAME}
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.c"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol.h"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.c"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-tcp.h"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.c"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus.h"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.c"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-protocol-aux.h"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.c"
-  "${CMAKE_CURRENT_LIST_DIR}/mbus/mbus-serial.h")
-target_include_directories(
-  ${PROJECT_NAME}
-  PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
-  target_link_libraries(${PROJECT_NAME} PRIVATE m)
-endif()
-if(NOT MSVC)
-  target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wno-pedantic)
-endif()
-
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-
-if(CLANG_TIDY_EXE)
-  set_target_properties(${PROJECT_NAME} PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_EXE}")
-endif()
-
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-# ##############################################################################
-# examples
-# ##############################################################################
-
-if(LIBMBUS_BUILD_EXAMPLES)
-  message(STATUS "building examples")
-  add_subdirectory(bin)
-endif()
-
-# ##############################################################################
-# tests
-# ##############################################################################
-
-if(LIBMBUS_BUILD_TESTS)
-  message(STATUS "building tests")
-  enable_testing()
-  add_subdirectory(test)
-endif()
-
-# ##############################################################################
-# install
-# ##############################################################################
-
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-
-set(INSTALL_PKGCONFIG_DIR
-    "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig"
-    CACHE PATH "Installation directory for pkgconfig (.pc) files")
-set(INSTALL_INC_DIR
-    "${CMAKE_INSTALL_INCLUDEDIR}/mbus"
-    CACHE PATH "Installation directory for headers")
-set(INSTALL_LIB_DIR
-    "${CMAKE_INSTALL_LIBDIR}"
-    CACHE PATH "Installation directory for libraries")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libmbus.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libmbus.pc @ONLY)
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/libmbus.pc
-  DESTINATION "${INSTALL_PKGCONFIG_DIR}"
-  COMPONENT dev)
-
-set(LIBMBUS_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-install(
-  TARGETS ${PROJECT_NAME}
-  EXPORT ${PROJECT_NAME}Targets
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT lib
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT dev
-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib)
-install(
-  EXPORT ${PROJECT_NAME}Targets
-  DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}"
-  NAMESPACE ${PROJECT_NAME}::
-  COMPONENT dev)
-
-configure_package_config_file(cmake/Config.cmake.in ${PROJECT_NAME}Config.cmake INSTALL_DESTINATION
-                              "${LIBMBUS_CONFIG_INSTALL_DIR}")
-write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY SameMajorVersion)
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-  DESTINATION "${LIBMBUS_CONFIG_INSTALL_DIR}"
-  COMPONENT dev)
-
-install(
-  DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/mbus/"
-  DESTINATION "${INSTALL_INC_DIR}"
-  COMPONENT dev
-  FILES_MATCHING
-  PATTERN "*.h")
-
-# ##############################################################################
-# package
-# mkdir build ; cd build ; cmake .. -DLIBMBUS_PACKAGE_DEB=ON ; cpack ..
-# ##############################################################################
-
-include(InstallRequiredSystemLibraries)
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open source M-bus (Meter-Bus) library.")
-set(CPACK_PACKAGE_DESCRIPTION
-    "libmbus is an open source library for the M-bus (Meter-Bus) protocol.
-The Meter-Bus is a standard for reading out meter data from electricity meters,
-heat meters, gas meters, etc. The M-bus standard deals with both the electrical
-signals on the M-Bus, and the protocol and data format used in transmissions
-on the M-Bus. The role of libmbus is to decode/encode M-bus data, and to handle
-the communication with M-Bus devices.
-
-For more information see http://www.rscada.se/libmbus")
-
-set(CPACK_PACKAGE_VENDOR "Raditex Control AB")
-set(CPACK_PACKAGE_CONTACT "Stefan Wahren <info@lategoodbye.de>")
-set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/rscada/libmbus/")
-set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE)
-set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-set(CPACK_DEB_COMPONENT_INSTALL ON)
-set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
-set(CPACK_PACKAGE_RELEASE 1)
-
-# create 2 components, libmbus, libmbus-dev
-set(CPACK_COMPONENTS_ALL lib dev)
-set(CPACK_COMPONENT_LIB_DESCRIPTION "FreeSCADA M-Bus Library.
-    A free and open-source library for M-Bus (Meter Bus) from the rSCADA project.")
-set(CPACK_DEBIAN_LIB_PACKAGE_SECTION libs)
-
-set(CPACK_COMPONENT_DEVEL_DESCRIPTION
-    "FreeSCADA M-Bus Library Development files.
-A free and open-source library for M-Bus (Meter Bus) from the rSCADA project,
-including development files.")
-set(CPACK_DEBIAN_DEVEL_PACKAGE_SECTION libdevel)
-
-set(CPACK_COMPONENT_DEVEL_DEPENDS lib)
-
-set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-set(CPACK_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-if(LIBMBUS_PACKAGE_DEB)
-  set(CPACK_GENERATOR "DEB")
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Stefan Wahren <info@lategoodbye.de>")
-  set(CPACK_DEBIAN_PACKAGE_SECTION "Development/Languages/C and C++")
-  set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
-  set(CPACK_DEBIAN_PACKAGE_VERSION
-      "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${CPACK_PACKAGE_RELEASE}"
-  )
-endif()
-
-if(LIBMBUS_PACKAGE_RPM)
-  set(CPACK_GENERATOR "RPM")
-  set(CPACK_RPM_PACKAGE_LICENSE "BSD")
-endif()
-
-include(CPack)
-
-# ##############################################################################
-# doc
-# mkdir build ; cd build ; cmake .. -DLIBMBUS_BUILD_DOCS=ON ; cmake --build . --target doc
-# ##############################################################################
-
-if(LIBMBUS_BUILD_DOCS)
-  message(STATUS "building with documentation")
-  # Generate targets for documentation
-  # check if Doxygen is installed
-  find_package(Doxygen)
-
-  if(Doxygen_FOUND)
-    # set input and output files
-    set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
-    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-
-    # request to configure the file
-    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
-
-    # note the option ALL which allows to build the docs together with the application
-    add_custom_target(
-      doc ALL
-      COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Generating API documentation with Doxygen"
-      VERBATIM)
-
-    message(STATUS "Setup up the Doxygen documention build")
-
-  else(Doxygen_FOUND)
-    message(WARNING "Doxygen need to be installed to generate the doxygen documentation")
-  endif(Doxygen_FOUND)
-endif()
diff --git a/Dockerfile.deb b/Dockerfile.deb
deleted file mode 100644
index 1db6923d..00000000
--- a/Dockerfile.deb
+++ /dev/null
@@ -1,14 +0,0 @@
-# docker build . -f Dockerfile.deb -t deb_builder
-
-FROM ubuntu
-
-RUN apt update -y && apt install -y cmake gcc g++ make
-COPY . /tmp
-RUN cd /tmp && \
-    mkdir build && \
-    cd build && \
-    cmake .. -DLIBMBUS_PACKAGE_DEB=ON && \
-    cpack .. && \
-    ls -al && \
-    dpkg -i *.deb
-
diff --git a/Dockerfile.rpm b/Dockerfile.rpm
deleted file mode 100644
index 2f70df96..00000000
--- a/Dockerfile.rpm
+++ /dev/null
@@ -1,14 +0,0 @@
-# docker build . -f Dockerfile.rpm -t rpm_builder
-
-FROM fedora
-
-RUN dnf install -y cmake gcc g++ make rpm-build
-COPY . /tmp
-RUN cd /tmp && \
-    mkdir build && \
-    cd build && \
-    cmake .. -DLIBMBUS_PACKAGE_RPM=ON && \
-    cpack .. && \
-    ls -al && \
-    rpm -i *.rpm
-
diff --git a/Dockerfile.test b/Dockerfile.test
deleted file mode 100644
index 52ee1792..00000000
--- a/Dockerfile.test
+++ /dev/null
@@ -1,18 +0,0 @@
-# docker build . -f Dockerfile.test -t test_builder
-
-FROM ubuntu
-
-RUN apt update -y && apt install -y cmake gcc g++ make
-COPY . /tmp
-RUN cd /tmp && \
-    mkdir build && \
-    cd build && \
-    cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON -DLIBMBUS_ENABLE_COVERAGE=ON && \
-    cmake --build . -j && \
-    cd .. && \
-    ./test/generate-xml.sh test/test-frames
-
-RUN cd /tmp && \
-    echo "NOTE: error-frames have about 30 parse errors, and unsupported-frames have 12" && \
-    ./test/generate-xml.sh test/error-frames || true ; \
-    ./test/generate-xml.sh test/unsupported-frames || true
diff --git a/Makefile-static b/Makefile-static
new file mode 100644
index 00000000..93da7516
--- /dev/null
+++ b/Makefile-static
@@ -0,0 +1,25 @@
+# Copyright (c) 2010
+# Robert Johansson
+# Raditex AB.
+# All rights reserved.
+
+LIB = libmbus.so
+
+CFLAGS = -Wall -W -g -fPIC -I.
+HEADERS = mbus.h mbus-protocol.h
+OBJS    = mbus.o mbus-protocol.o
+
+$(LIB): $(OBJS)
+	gcc -shared -o $(LIB) $(OBJS)
+
+all: $(LIB)
+
+clean:
+	rm -rf *.o *core core $(LIB)
+
+test:
+	(cd test && make)
+
+install: all
+	cp $(LIB) /usr/local/freescada/lib
+	cp $(HEADERS) /usr/local/freescada/include
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..fd519e14
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,20 @@
+#
+#
+#
+PACKAGE		= @PACKAGE@
+VERSION		= @VERSION@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmbus.pc
+
+
+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+dist_docdir = $(DESTDIR)$(docdir)
+doc_DATA = README.md \
+           COPYING \
+           hardware/MBus_USB.pdf \
+           hardware/MBus_USB.txt
+
+SUBDIRS		= mbus bin
+ACLOCAL		= aclocal -I .
+ACLOCAL_AMFLAGS = -Werror -I m4
diff --git a/README.md b/README.md
index 133c243d..27d393c0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# libmbus: M-bus Library from Raditex Control (http://www.rscada.se) <span style="float:right;"><a href="https://travis-ci.org/rscada/libmbus" style="border-bottom:none">
-
-![Build Status](https://travis-ci.org/rscada/libmbus.svg?branch=master)</a></span>
+# libmbus: M-bus Library from Raditex Control (http://www.rscada.se) <span style="float:right;"><a href="https://travis-ci.org/rscada/libmbus" style="border-bottom:none">![Build Status](https://travis-ci.org/rscada/libmbus.svg?branch=master)</a></span>
 
 libmbus is an open source library for the M-bus (Meter-Bus) protocol.
 
@@ -10,32 +8,4 @@ signals on the M-Bus, and the protocol and data format used in transmissions on
 the M-Bus. The role of libmbus is to decode/encode M-bus data, and to handle
 the communication with M-Bus devices.
 
-
-## BUILD
-
-with cmake
-
-```bash
-rm -rf _build
-mkdir _build
-cd _build
-# configure
-# e.g. on linux
-cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON
-# e.g. for a target device
-cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DCMAKE_TOOLCHAIN_FILE=/path/to/toolchain/foo-bar-baz.cmake
-# compile
-cmake --build . -j
-# install - optional
-cmake --build . --target install
-```
-
-## CONSUME
-
-```cmake
-find_package(libmbus)
-add_executable(my_app main.cpp)
-target_link_libraries(my_app libmbus::libmbus)
-```
-
 For more information see http://www.rscada.se/libmbus
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
deleted file mode 100644
index 73e15002..00000000
--- a/bin/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-function(add_example SRCS)
-  add_executable(${SRCS} ${CMAKE_CURRENT_LIST_DIR}/${SRCS}.c)
-  target_link_libraries(${SRCS} PRIVATE libmbus::libmbus)
-endfunction()
-
-add_example(mbus-serial-request-data)
-add_example(mbus-serial-request-data-multi-reply)
-add_example(mbus-serial-scan)
-add_example(mbus-serial-scan-secondary)
-add_example(mbus-serial-select-secondary)
-add_example(mbus-serial-set-address)
-add_example(mbus-serial-switch-baudrate)
-add_example(mbus-tcp-application-reset)
-add_example(mbus-tcp-raw-send)
-add_example(mbus-tcp-request-data)
-add_example(mbus-tcp-request-data-multi-reply)
-add_example(mbus-tcp-scan)
-add_example(mbus-tcp-scan-secondary)
-add_example(mbus-tcp-select-secondary)
diff --git a/bin/Makefile-static b/bin/Makefile-static
new file mode 100644
index 00000000..2b04b493
--- /dev/null
+++ b/bin/Makefile-static
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2011, Robert Johansson, Raditex AB
+# All rights reserved.
+#
+# rSCADA 
+# http://www.rSCADA.se
+# info@rscada.se
+#
+CFLAGS=-Wall -g -I..
+LDFLAGS=-L.. -lm -lmbus
+
+all: mbus-tcp-scan mbus-tcp-request-data
+
+%.o: %.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+mbus-tcp-scan: mbus-tcp-scan.o mbus-tcp.o
+	gcc -o $@ $^ $(LDFLAGS) 
+	
+mbus-tcp-request-data: mbus-tcp-request-data.o mbus-tcp.o
+	gcc -o $@ $^ $(LDFLAGS) 
+
+clean:
+	rm -rf mbus-tcp-request-data mbus-tcp-scan *.o *~
diff --git a/bin/Makefile.am b/bin/Makefile.am
new file mode 100644
index 00000000..7c9ce412
--- /dev/null
+++ b/bin/Makefile.am
@@ -0,0 +1,102 @@
+# ------------------------------------------------------------------------------
+# Copyright (C) 2010, Raditex AB
+# All rights reserved.
+#
+# rSCADA 
+# http://www.rSCADA.se
+# info@rscada.se
+#
+# ------------------------------------------------------------------------------  
+PACKAGE			= @PACKAGE@
+VERSION			= @VERSION@
+
+AM_CPPFLAGS	= -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src
+
+noinst_HEADERS			= 
+bin_PROGRAMS			= mbus-tcp-scan mbus-tcp-request-data mbus-tcp-request-data-multi-reply \
+                          mbus-tcp-select-secondary mbus-tcp-scan-secondary \
+                          mbus-serial-scan mbus-serial-request-data mbus-serial-request-data-multi-reply \
+                          mbus-serial-select-secondary mbus-serial-scan-secondary \
+                          mbus-serial-switch-baudrate mbus-tcp-raw-send mbus-tcp-application-reset \
+                          mbus-serial-set-address
+
+# tcp
+mbus_tcp_scan_LDFLAGS	= -L$(top_builddir)/mbus
+mbus_tcp_scan_LDADD		= -lmbus -lm
+mbus_tcp_scan_SOURCES	= mbus-tcp-scan.c 
+
+mbus_tcp_request_data_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_request_data_LDADD	  = -lmbus -lm
+mbus_tcp_request_data_SOURCES = mbus-tcp-request-data.c
+
+mbus_tcp_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_request_data_multi_reply_LDADD	  = -lmbus -lm
+mbus_tcp_request_data_multi_reply_SOURCES = mbus-tcp-request-data-multi-reply.c
+
+mbus_tcp_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_select_secondary_LDADD	  = -lmbus -lm
+mbus_tcp_select_secondary_SOURCES = mbus-tcp-select-secondary.c
+
+mbus_tcp_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_scan_secondary_LDADD	= -lmbus -lm
+mbus_tcp_scan_secondary_SOURCES = mbus-tcp-scan-secondary.c
+
+mbus_tcp_raw_send_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_raw_send_LDADD	  = -lmbus -lm
+mbus_tcp_raw_send_SOURCES = mbus-tcp-raw-send.c
+
+mbus_tcp_application_reset_LDFLAGS = -L$(top_builddir)/mbus
+mbus_tcp_application_reset_LDADD   = -lmbus -lm
+mbus_tcp_application_reset_SOURCES = mbus-tcp-application-reset.c
+
+# serial
+mbus_serial_scan_LDFLAGS	= -L$(top_builddir)/mbus
+mbus_serial_scan_LDADD		= -lmbus -lm
+mbus_serial_scan_SOURCES	= mbus-serial-scan.c 
+
+mbus_serial_request_data_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_request_data_LDADD	 = -lmbus -lm
+mbus_serial_request_data_SOURCES = mbus-serial-request-data.c
+
+mbus_serial_request_data_multi_reply_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_request_data_multi_reply_LDADD   = -lmbus -lm
+mbus_serial_request_data_multi_reply_SOURCES = mbus-serial-request-data-multi-reply.c
+
+mbus_serial_select_secondary_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_select_secondary_LDADD	 = -lmbus -lm
+mbus_serial_select_secondary_SOURCES = mbus-serial-select-secondary.c
+
+mbus_serial_scan_secondary_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_scan_secondary_LDADD   = -lmbus -lm
+mbus_serial_scan_secondary_SOURCES = mbus-serial-scan-secondary.c
+
+mbus_serial_switch_baudrate_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_switch_baudrate_LDADD   = -lmbus -lm
+mbus_serial_switch_baudrate_SOURCES = mbus-serial-switch-baudrate.c
+
+mbus_serial_set_address_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_set_address_LDADD   = -lmbus -lm
+mbus_serial_set_address_SOURCES = mbus-serial-set-address.c
+
+# man pages
+dist_man_MANS = libmbus.1 \
+                mbus-tcp-scan.1 \
+                mbus-tcp-request-data.1 \
+                mbus-tcp-request-data-multi-reply.1 \
+                mbus-tcp-select-secondary.1 \
+                mbus-tcp-scan-secondary.1 \
+                mbus-tcp-raw-send.1 \
+                mbus-serial-scan.1 \
+                mbus-serial-request-data.1 \
+                mbus-serial-request-data-multi-reply.1 \
+                mbus-serial-select-secondary.1 \
+                mbus-serial-scan-secondary.1 \
+                mbus-serial-switch-baudrate.1
+
+.pod.1:
+	pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
+		>.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
+	@if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
+	then \
+		echo "$@ has some POD errors!"; false; \
+	fi
diff --git a/build-deb.sh b/build-deb.sh
new file mode 100755
index 00000000..77f3a6be
--- /dev/null
+++ b/build-deb.sh
@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+#  Copyright (C) 2012, Robert Johansson <rob@raditex.nu>, Raditex Control AB
+#  All rights reserved.
+# 
+#  rSCADA 
+#  http://www.rSCADA.se
+#  info@raditex.nu
+# 
+# ------------------------------------------------------------------------------
+
+if [ ! -f Makefile ]; then
+	#
+	# regenerate automake files
+	#
+    echo "Running autotools..."
+
+    autoheader \
+        && aclocal \
+        && libtoolize --ltdl --copy --force \
+        && automake --add-missing --copy \
+        && autoconf
+fi
+
+debuild -i -us -uc -b 
+#sudo pbuilder build $(NAME)_$(VERSION)-1.dsc
diff --git a/build.sh b/build.sh
index 04ea869c..34c2799b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,24 +1,21 @@
 #!/bin/sh
+#
 
+if [ -f Makefile ]; then
+    # use existing automake files
+    echo >> /dev/null
+else
+    # regenerate automake files
+    echo "Running autotools..."
 
-rm -rf build
-mkdir build
-cd build
-cmake .. -DLIBMBUS_BUILD_EXAMPLES=ON -DLIBMBUS_BUILD_TESTS=ON
-cmake --build .
+    autoheader \
+        && aclocal \
+        && case \
+          $(uname) in Darwin*) glibtoolize --ltdl --copy --force ;; \
+          *) libtoolize --ltdl --copy --force ;; esac \
+        && automake --add-missing --copy \
+        && autoconf \
+        && ./configure
+fi
 
-# build deb
-
-# rm -rf build
-# mkdir build
-# cd build
-# cmake .. -DLIBMBUS_PACKAGE_DEB=ON
-# cpack ..
-# dpkg -i *.deb
-
-# build doc
-
-# mkdir build
-# cd build
-# cmake .. -DLIBMBUS_BUILD_DOCS=ON
-# cmake --build . --target doc
+make
diff --git a/cmake-format.yaml b/cmake-format.yaml
deleted file mode 100644
index 60329ed6..00000000
--- a/cmake-format.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# https://github.com/cheshirekow/cmake_format
-
-# How wide to allow formatted cmake files
-line_width: 120
-
-# How many spaces to tab for indent
-tab_size: 2
-
-# Format command names consistently as 'lower' or 'upper' case
-command_case: "lower"
-
-first_comment_is_literal: False
-
-# enable comment markup parsing and reflow
-enable_markup: False
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
deleted file mode 100644
index 9c15f36a..00000000
--- a/cmake/Config.cmake.in
+++ /dev/null
@@ -1,4 +0,0 @@
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-check_required_components("@PROJECT_NAME@")
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 00000000..d14d0e2c
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,44 @@
+dnl ----------------------------------------------------------------------------
+dnl Copyright (C) 2010, Raditex AB
+dnl All rights reserved.
+dnl
+dnl rSCADA 
+dnl http://www.rSCADA.se
+dnl info@rscada.se
+dnl 
+dnl ----------------------------------------------------------------------------
+
+LT_CONFIG_LTDL_DIR([libltdl])
+
+AC_INIT([libmbus], [0.9.0], [info@rscada.se], [libmbus], [http://www.rscada.se/libmbus/])
+AC_CONFIG_AUX_DIR([libltdl/config])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+
+AM_PROG_LIBTOOL
+# fix for automake 1.11 & 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) 
+
+LDFLAGS="$LDFLAGS -version-info 0:9:0"
+
+dnl ----------------------
+dnl 
+AC_PROG_CC
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile mbus/Makefile test/Makefile bin/Makefile libmbus.pc])
+AC_OUTPUT
+
+
+echo \
+"----------------------------------------------------------
+Configuration:
+
+	Source location:	${srcdir}
+	Compile:		${CC}
+	Compiler flags:		${CFLAGS}
+	Linker flags:		${LDFLAGS}
+	Host system type:	${host}
+	Install path:		${prefix}
+
+	See config.h for further configuration.
+----------------------------------------------------------"
diff --git a/Doxyfile.in b/doxygen.cfg
similarity index 99%
rename from Doxyfile.in
rename to doxygen.cfg
index b8393df7..ea1b569d 100644
--- a/Doxyfile.in
+++ b/doxygen.cfg
@@ -25,13 +25,13 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "@CMAKE_PROJECT_NAME@"
+PROJECT_NAME           = libmbus
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+PROJECT_NUMBER         =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -581,7 +581,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @CMAKE_CURRENT_LIST_DIR@/mbus 
+INPUT                  = mbus 
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1628,6 +1628,3 @@ GENERATE_LEGEND        = YES
 # the various graphs.
 
 DOT_CLEANUP            = YES
-
-
-USE_MDFILE_AS_MAINPAGE = @CMAKE_CURRENT_LIST_DIR@/README.md
diff --git a/libmbus.pc.in b/libmbus.pc.in
index 1baf5a3e..6c1b7d8b 100644
--- a/libmbus.pc.in
+++ b/libmbus.pc.in
@@ -1,12 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: libmbus
 Description: Open source M-bus (Meter-Bus) library.
 Requires: 
-Version: @PROJECT_VERSION@
+Version: @PACKAGE_VERSION@
 URL: http://www.rscada.se/libmbus/
 Libs: -L${libdir} -lmbus -lm
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}
diff --git a/libmbus.spec b/libmbus.spec
new file mode 100644
index 00000000..06160f75
--- /dev/null
+++ b/libmbus.spec
@@ -0,0 +1,87 @@
+#
+# spec file for package libmbus
+#
+# Copyright (c) 2010-2013, Raditex Control AB
+# All rights reserved.
+#
+# rSCADA 
+# http://www.rSCADA.se
+# info@rscada.se
+#
+
+Summary: 	Open source M-bus (Meter-Bus) library
+Name: 		libmbus
+Version: 	0.9.0
+Release: 	1
+Source:	 	https://github.com/rscada/%{name}/archive/%{version}.tar.gz
+URL:		https://github.com/rscada/libmbus/
+License:	BSD
+Vendor:		Raditex Control AB
+Packager:	Stefan Wahren <info@lategoodbye.de>
+Group: 		Development/Languages/C and C++ 
+BuildRoot: 	{_tmppath}/%{name}-%{version}-build
+AutoReqProv:	on 
+
+%description
+libmbus: M-bus Library from Raditex Control (http://www.rscada.se)
+
+libmbus is an open source library for the M-bus (Meter-Bus) protocol. 
+The Meter-Bus is a standard for reading out meter data from electricity meters, 
+heat meters, gas meters, etc. The M-bus standard deals with both the electrical
+signals on the M-Bus, and the protocol and data format used in transmissions 
+on the M-Bus. The role of libmbus is to decode/encode M-bus data, and to handle
+the communication with M-Bus devices.
+
+For more information see http://www.rscada.se/libmbus
+
+%package devel
+License:        BSD
+Summary:        Development libraries and header files for using the M-bus library
+Group:          Development/Libraries/C and C++
+AutoReqProv:    on
+Requires:       %{name} = %{version}
+
+%description devel
+This package contains all necessary include files and libraries needed
+to compile and link applications which use the M-bus (Meter-Bus) library.
+
+%prep -q
+%setup -q
+# workaround to get it's build
+autoreconf
+
+%build
+./configure --prefix=/usr
+make
+
+%install
+rm -Rf "%buildroot"
+mkdir "%buildroot"
+make install DESTDIR="%buildroot"
+
+%clean
+rm -rf "%buildroot"
+
+%files
+%defattr (-,root,root)
+%doc COPYING README.md
+%{_bindir}/mbus-serial-*
+%{_bindir}/mbus-tcp-*
+%{_libdir}/libmbus.so*
+%{_mandir}/man1/libmbus.1
+%{_mandir}/man1/mbus-*
+
+%files devel
+%defattr (-,root,root)
+%{_includedir}/mbus
+%{_libdir}/libmbus.a
+%{_libdir}/libmbus.la
+%{_libdir}/pkgconfig/libmbus.pc
+
+%changelog
+* Fri Feb 22 2019 Stefan Wahren <info@lategoodbye.de> - 0.9.0-1
+- switch to github repo
+- enable man pages
+
+* Fri Mar 29 2013 Stefan Wahren <info@lategoodbye.de> - 0.8.0-1
+- Initial package based on the last official release
diff --git a/mbus/Makefile.am b/mbus/Makefile.am
new file mode 100644
index 00000000..b0749871
--- /dev/null
+++ b/mbus/Makefile.am
@@ -0,0 +1,20 @@
+# ------------------------------------------------------------------------------
+# Copyright (C) 2010, Raditex AB
+# All rights reserved.
+#
+# rSCADA 
+# http://www.rSCADA.se
+# info@rscada.se
+#
+# ------------------------------------------------------------------------------
+PACKAGE		= @PACKAGE@
+VERSION		= @VERSION@
+
+AM_CPPFLAGS	= -I$(top_builddir) -I$(top_srcdir)
+
+includedir = $(prefix)/include/mbus
+include_HEADERS = mbus.h mbus-protocol.h mbus-tcp.h mbus-serial.h mbus-protocol-aux.h
+
+lib_LTLIBRARIES	   = libmbus.la
+libmbus_la_SOURCES = mbus.c mbus-protocol.c mbus-tcp.c mbus-serial.c mbus-protocol-aux.c
+
diff --git a/mbus/config.h.in b/mbus/config.h.in
deleted file mode 100644
index 9b818f65..00000000
--- a/mbus/config.h.in
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H "@HAVE_DLFCN_H@"
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H "@HAVE_INTTYPES_H@"
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine HAVE_MEMORY_H "@HAVE_MEMORY_H@"
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H "@HAVE_STDINT_H@"
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H "@HAVE_STDLIB_H@"
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H "@HAVE_STRINGS_H@"
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H "@HAVE_STRING_H@"
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H "@HAVE_SYS_STAT_H@"
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H "@HAVE_SYS_TYPES_H@"
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H "@HAVE_UNISTD_H@"
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "@PROJECT_NAME@"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "info@rscada.se"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "@PROJECT_NAME@"
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "@PROJECT_NAME@"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.rscada.se/libmbus/"
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-/* Version number of package */
-#cmakedefine VERSION "@PACKAGE_VERSION@"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 0303d236..00000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_executable(mbus_parse ${CMAKE_CURRENT_LIST_DIR}/mbus_parse.c)
-target_link_libraries(mbus_parse PRIVATE libmbus::libmbus)
-
-add_executable(mbus_parse_hex ${CMAKE_CURRENT_LIST_DIR}/mbus_parse_hex.c)
-target_link_libraries(mbus_parse_hex PRIVATE libmbus::libmbus)
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 00000000..c373fa48
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+# Copyright (C) 2010, Raditex AB
+# All rights reserved.
+#
+# rSCADA 
+# http://www.rSCADA.se
+# info@rscada.se
+#
+# ------------------------------------------------------------------------------  
+PACKAGE			= @PACKAGE@
+VERSION			= @VERSION@
+
+AM_CPPFLAGS	= -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/mbus
+
+noinst_HEADERS			= 
+noinst_PROGRAMS			= mbus_parse mbus_parse_hex
+
+mbus_parse_LDFLAGS	= -L$(top_builddir)/mbus
+mbus_parse_LDADD	= -lmbus -lm
+mbus_parse_SOURCES	= mbus_parse.c
+
+mbus_parse_hex_LDFLAGS	= -L$(top_builddir)/mbus
+mbus_parse_hex_LDADD	= -lmbus -lm
+mbus_parse_hex_SOURCES	= mbus_parse_hex.c
+

From fcfa11dd976189dfc065375017aad1a8bc0f3d70 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Sun, 19 Jul 2020 12:24:27 +0200
Subject: [PATCH 20/29] changelog: Add release 0.9.0

---
 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5dce9087..8c177b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libmbus (0.9.0) xenial; urgency=medium
+
+  * New official release
+    - major improvement to frame decoding
+    - new binaries: mbus-tcp-raw-send, mbus-tcp-application-reset,
+      mbus-serial-set-address
+    - simple echo cancellation
+    - replace CUnit test with test/generate-xml.sh
+  * debian/control: new package libmbus1-dbg
+
+ -- Stefan Wahren <stefan.wahren@i2se.com>  Fri, 22 Feb 2019 19:08:04 +0100
+
 libmbus (0.8.0) precise; urgency=low
 
   * New official release. Includes support for multi-telegram communication.

From 17b2c1d2bd820b8e3960795f503c1165eb41af8e Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 23 Apr 2018 22:38:30 +0200
Subject: [PATCH 21/29] try offering FCB function

---
 mbus/mbus-protocol-aux.c | 36 ++++++++++++++++++++++++++++++++++++
 mbus/mbus-protocol-aux.h |  5 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c
index 60b5fa66..8479d063 100755
--- a/mbus/mbus-protocol-aux.c
+++ b/mbus/mbus-protocol-aux.c
@@ -1924,6 +1924,42 @@ mbus_send_request_frame(mbus_handle * handle, int address)
     return retval;
 }
 
+//------------------------------------------------------------------------------
+// send a request packet to from master to slave
+//------------------------------------------------------------------------------
+int
+mbus_send_request_frame_fcb(mbus_handle * handle, int address)
+{
+    int retval = 0;
+    mbus_frame *frame;
+
+    if (mbus_is_primary_address(address) == 0)
+    {
+        MBUS_ERROR("%s: invalid address %d\n", __PRETTY_FUNCTION__, address);
+        return -1;
+    }
+
+    frame = mbus_frame_new(MBUS_FRAME_TYPE_SHORT);
+
+    if (frame == NULL)
+    {
+        MBUS_ERROR("%s: failed to allocate mbus frame.\n", __PRETTY_FUNCTION__);
+        return -1;
+    }
+
+    frame->control = MBUS_CONTROL_MASK_REQ_UD2 | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB;
+    frame->address = address;
+
+    if (mbus_send_frame(handle, frame) == -1)
+    {
+        MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
+        retval = -1;
+    }
+
+    mbus_frame_free(frame);
+    return retval;
+}
+
 //------------------------------------------------------------------------------
 // send a user data packet from master to slave
 //------------------------------------------------------------------------------
diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h
index 4dacef4c..143c7eee 100755
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@@ -97,7 +97,7 @@ typedef struct _mbus_handle {
     void (*recv_event) (unsigned char src_type, const char *buff, size_t len);
     void (*send_event) (unsigned char src_type, const char *buff, size_t len);
     void (*scan_progress) (struct _mbus_handle *handle, const char *mask);
-    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);    
+    void (*found_event) (struct _mbus_handle *handle, mbus_frame *frame);
     void *auxdata;
 } mbus_handle;
 
@@ -293,7 +293,8 @@ int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baud
  *
  * @return Zero when successful.
  */
-int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame(mbus_handle * handle, int address);
+ int mbus_send_request_frame_fcb(mbus_handle * handle, int address);
 
 /**
  * Sends user data frame (SND_UD) to given slave using "unified" handle

From a5b256575b1acf48b7965653b945aedab969fd0e Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:08:47 +0200
Subject: [PATCH 22/29] * add github action build and tests

---
 .github/workflows/test.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..fc7b95a1
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,33 @@
+name: Test
+
+# Run this job on all pushes and pull requests
+# as well as tags with a semantic version
+on:
+  push:
+    branches:
+      - '*'
+  pull_request: {}
+
+jobs:
+
+  # Runs lib tests on all supported node versions and OSes
+  build-and-test:
+    if: contains(github.event.head_commit.message, '[skip ci]') == false
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - name: Build
+        run: ./build.sh
+
+      - name: Test Success Frames
+        run: cd test && make && ./generate-xml.sh test-frames
+
+      - name: Test Error Frames
+        run: cd test && make && ./generate-xml.sh test/error-frames || true
+
+      - name: Test Unsupported Frames
+        run: cd test && make && ./generate-xml.sh test/unsupported-frames || true

From c98829ba3747af2b038f82358484171e235ec256 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:10:26 +0200
Subject: [PATCH 23/29] * add github action build and tests

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fc7b95a1..e1d3a0ae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,8 @@ jobs:
         os: [ubuntu-latest, macos-latest]
 
     steps:
+      - uses: actions/checkout@v1
+
       - name: Build
         run: ./build.sh
 

From 3d59ab3b28c7a20961eb69cf1f5e44a7b5c85df1 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:20:39 +0200
Subject: [PATCH 24/29] * add automake on macos

---
 .github/workflows/test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e1d3a0ae..af35fb93 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - name: Install automake (macos)
+        if: startsWith(runner.OS, 'darwin')
+        run: brew install automake
+
       - name: Build
         run: ./build.sh
 

From 28f3e607aa9617a0ea0b663a26eef2738a24ea4b Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:24:24 +0200
Subject: [PATCH 25/29] * add automake on macos

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af35fb93..d87e6841 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Install automake (macos)
-        if: startsWith(runner.OS, 'darwin')
+        if: startsWith(runner.OS, 'macOS')
         run: brew install automake
 
       - name: Build

From 23168648d65245648518c697f6cee8b66ef91648 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:27:11 +0200
Subject: [PATCH 26/29] * adjust testing

---
 .github/workflows/test.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d87e6841..70a576a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,11 +29,14 @@ jobs:
       - name: Build
         run: ./build.sh
 
+      - name: Build tests
+        run: cd test && make
+
       - name: Test Success Frames
-        run: cd test && make && ./generate-xml.sh test-frames
+        run: ./generate-xml.sh test-frames
 
       - name: Test Error Frames
-        run: cd test && make && ./generate-xml.sh test/error-frames || true
+        run: ./generate-xml.sh error-frames || true
 
       - name: Test Unsupported Frames
-        run: cd test && make && ./generate-xml.sh test/unsupported-frames || true
+        run: ./generate-xml.sh unsupported-frames || true

From 83689c7f6d7dd6ef1d185a59d2f503a9a7d8bd4b Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:28:52 +0200
Subject: [PATCH 27/29] * adjust testing

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 70a576a0..93bd579e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,10 +33,10 @@ jobs:
         run: cd test && make
 
       - name: Test Success Frames
-        run: ./generate-xml.sh test-frames
+        run: ./test/generate-xml.sh test/test-frames
 
       - name: Test Error Frames
-        run: ./generate-xml.sh error-frames || true
+        run: ./test/generate-xml.sh test/error-frames || true
 
       - name: Test Unsupported Frames
-        run: ./generate-xml.sh unsupported-frames || true
+        run: ./test/generate-xml.sh test/unsupported-frames || true

From b15defbf41fc90fe404b17dfd9494ac740f4e6c3 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:30:05 +0200
Subject: [PATCH 28/29] * adjust testing

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 93bd579e..2ac1d690 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,10 +33,10 @@ jobs:
         run: cd test && make
 
       - name: Test Success Frames
-        run: ./test/generate-xml.sh test/test-frames
+        run: cd test && ./generate-xml.sh test-frames
 
       - name: Test Error Frames
-        run: ./test/generate-xml.sh test/error-frames || true
+        run: cd test && ./generate-xml.sh error-frames || true
 
       - name: Test Unsupported Frames
-        run: ./test/generate-xml.sh test/unsupported-frames || true
+        run: cd test && ./generate-xml.sh unsupported-frames || true

From fc8bb5ec1d058aeea1bd9a25f9c4f6cb0d9d2b04 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Wed, 29 Jun 2022 14:32:32 +0200
Subject: [PATCH 29/29] * remove travis

---
 .travis.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 70b00795..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-language: c
-
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-  - osx
-
-script: 
-  - ./build.sh
-  - cd test && make && ./generate-xml.sh test-frames
-  - cd test && make && ./generate-xml.sh test/error-frames || true
-  - cd test && make && ./generate-xml.sh test/unsupported-frames || true