diff --git a/src/backend/xml/sixtp-dom-generators.c b/src/backend/xml/sixtp-dom-generators.c
index 2cc61e1a7d..5e052ad0ed 100644
--- a/src/backend/xml/sixtp-dom-generators.c
+++ b/src/backend/xml/sixtp-dom-generators.c
@@ -334,15 +334,13 @@ add_kvp_value_node(xmlNodePtr node, gchar *tag, kvp_value* val)
     case KVP_TYPE_GLIST:
     {
         GList *cursor;
-        GList *sorted = g_list_sort(g_list_copy(kvp_value_get_glist(val)), (GCompareFunc)strcmp);
 
         xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "list");
-        for (cursor = sorted; cursor; cursor = cursor->next)
+        for (cursor = kvp_value_get_glist(val); cursor; cursor = cursor->next)
         {
             kvp_value *val = (kvp_value*)cursor->data;
             add_kvp_value_node(val_node, "slot:value", val);
         }
-        g_list_free(sorted);
     }
 
     break;
diff --git a/src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2 b/src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
index 39d9481d4a..30eb035c32 100644
--- a/src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
+++ b/src/backend/xml/test/test-files/xml2/Money95bank_fr.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/Money95invst.gml2 b/src/backend/xml/test/test-files/xml2/Money95invst.gml2
index 4c60cee08a..8e8513e554 100644
--- a/src/backend/xml/test/test-files/xml2/Money95invst.gml2
+++ b/src/backend/xml/test/test-files/xml2/Money95invst.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/Money95mutual.gml2 b/src/backend/xml/test/test-files/xml2/Money95mutual.gml2
index 7e77599fa2..848e7efd80 100644
--- a/src/backend/xml/test/test-files/xml2/Money95mutual.gml2
+++ b/src/backend/xml/test/test-files/xml2/Money95mutual.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/Money95stocks.gml2 b/src/backend/xml/test/test-files/xml2/Money95stocks.gml2
index f82b9f9001..2d169db44c 100644
--- a/src/backend/xml/test/test-files/xml2/Money95stocks.gml2
+++ b/src/backend/xml/test/test-files/xml2/Money95stocks.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/abc.gml2 b/src/backend/xml/test/test-files/xml2/abc.gml2
index 99fe2f1ca5..83818f000d 100644
--- a/src/backend/xml/test/test-files/xml2/abc.gml2
+++ b/src/backend/xml/test/test-files/xml2/abc.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/abcall.gml2 b/src/backend/xml/test/test-files/xml2/abcall.gml2
index cd45741c38..398dcc3845 100644
--- a/src/backend/xml/test/test-files/xml2/abcall.gml2
+++ b/src/backend/xml/test/test-files/xml2/abcall.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/carols-data-file.gml2 b/src/backend/xml/test/test-files/xml2/carols-data-file.gml2
index a6bffb73c0..c2acc41386 100644
--- a/src/backend/xml/test/test-files/xml2/carols-data-file.gml2
+++ b/src/backend/xml/test/test-files/xml2/carols-data-file.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/cbb-export.gml2 b/src/backend/xml/test/test-files/xml2/cbb-export.gml2
index 6c496e6edf..da8e46feb9 100644
--- a/src/backend/xml/test/test-files/xml2/cbb-export.gml2
+++ b/src/backend/xml/test/test-files/xml2/cbb-export.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/conrads-file.gml2 b/src/backend/xml/test/test-files/xml2/conrads-file.gml2
index a7567c6351..26cd5452c1 100644
--- a/src/backend/xml/test/test-files/xml2/conrads-file.gml2
+++ b/src/backend/xml/test/test-files/xml2/conrads-file.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/every.gml2 b/src/backend/xml/test/test-files/xml2/every.gml2
index dff4ae83c6..b65daf0358 100644
--- a/src/backend/xml/test/test-files/xml2/every.gml2
+++ b/src/backend/xml/test/test-files/xml2/every.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/goonies-file.gml2 b/src/backend/xml/test/test-files/xml2/goonies-file.gml2
index 28bdb768f9..a01c9f2913 100644
--- a/src/backend/xml/test/test-files/xml2/goonies-file.gml2
+++ b/src/backend/xml/test/test-files/xml2/goonies-file.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2 b/src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
index cfeb352923..9536677b90 100644
--- a/src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
+++ b/src/backend/xml/test/test-files/xml2/hierachical-data-file.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/ms-money.gml2 b/src/backend/xml/test/test-files/xml2/ms-money.gml2
index e239f2b097..bd9ed4d35d 100644
--- a/src/backend/xml/test/test-files/xml2/ms-money.gml2
+++ b/src/backend/xml/test/test-files/xml2/ms-money.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-files/xml2/pricedb1.gml2 b/src/backend/xml/test/test-files/xml2/pricedb1.gml2
index 163ccbfd12..9853a04d1d 100644
--- a/src/backend/xml/test/test-files/xml2/pricedb1.gml2
+++ b/src/backend/xml/test/test-files/xml2/pricedb1.gml2
@@ -15,19 +15,19 @@
      xmlns:bgt="http://www.gnucash.org/XML/bgt"
      xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
      xmlns:lot="http://www.gnucash.org/XML/lot"
-     xmlns:job="http://www.gnucash.org/XML/job"
-     xmlns:invoice="http://www.gnucash.org/XML/invoice"
      xmlns:addr="http://www.gnucash.org/XML/addr"
-     xmlns:cust="http://www.gnucash.org/XML/cust"
+     xmlns:owner="http://www.gnucash.org/XML/owner"
      xmlns:billterm="http://www.gnucash.org/XML/billterm"
      xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
      xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
-     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
-     xmlns:tte="http://www.gnucash.org/XML/tte"
-     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:cust="http://www.gnucash.org/XML/cust"
      xmlns:employee="http://www.gnucash.org/XML/employee"
      xmlns:entry="http://www.gnucash.org/XML/entry"
-     xmlns:owner="http://www.gnucash.org/XML/owner"
+     xmlns:invoice="http://www.gnucash.org/XML/invoice"
+     xmlns:job="http://www.gnucash.org/XML/job"
+     xmlns:order="http://www.gnucash.org/XML/order"
+     xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+     xmlns:tte="http://www.gnucash.org/XML/tte"
      xmlns:vendor="http://www.gnucash.org/XML/vendor">
 <gnc:count-data cd:type="book">1</gnc:count-data>
 <gnc:book version="2.0.0">
diff --git a/src/backend/xml/test/test-xml-transaction.c b/src/backend/xml/test/test-xml-transaction.c
index d8bde8935e..939454e2e1 100644
--- a/src/backend/xml/test/test-xml-transaction.c
+++ b/src/backend/xml/test/test-xml-transaction.c
@@ -349,6 +349,7 @@ test_add_transaction(const char *tag, gpointer globaldata, gpointer data)
 {
     Transaction *trans = data;
     tran_data *gdata = (tran_data*)globaldata;
+    gboolean retval = TRUE;
 
     xaccTransBeginEdit (trans);
     xaccTransSetCurrency (trans, gdata->com);
@@ -358,11 +359,11 @@ test_add_transaction(const char *tag, gpointer globaldata, gpointer data)
                       "gnc_transaction_sixtp_parser_create",
                       __FILE__, __LINE__,
                       "%d", gdata->value))
-        return FALSE;
+        retval = FALSE;
 
     gdata->new_trn = trans;
 
-    return TRUE;
+    return retval;
 }
 
 static void