From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 27 Jul 2015 12:55:55 +0000 (+0200)
Subject: make our tests work on 32bit binaries (with only 9 digit precision) work as well.
X-Git-Tag: v1.5.4~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49bfd5080b08ef546ae2ae83665bfb91a1adcfe7;p=thirdparty%2Frrdtool-1.x.git

make our tests work on 32bit binaries (with only 9 digit precision) work as well.
---

diff --git a/tests/create-with-source-1 b/tests/create-with-source-1
index cfa8c9c7..36dc7cbc 100755
--- a/tests/create-with-source-1
+++ b/tests/create-with-source-1
@@ -24,7 +24,6 @@ function cpd_prep_filter {
 # test: add the additional RRA to the first and compare dumps 
 
 rm -f ${PREFIX}*.rrd ${PREFIX}*.xml
-
 ST=1300000000
 $RRDTOOL create ${PREFIX}a1.rrd --start $(($ST-1)) --step 60 DS:a:GAUGE:120:0:U  RRA:AVERAGE:0.5:1:100 RRA:AVERAGE:0.5:5:2 RRA:MIN:0.5:5:2 RRA:MAX:0.5:5:2 RRA:LAST:0.5:5:2 
 report create1
diff --git a/tests/dcounter1 b/tests/dcounter1
index df803e06..7389e074 100755
--- a/tests/dcounter1
+++ b/tests/dcounter1
@@ -96,5 +96,5 @@ report "update all"
 is_cached && exit 0
 
 $RRDTOOL fetch ${BUILD}.rrd AVERAGE -r 600 -s 1300000000 -e 1300015200 | grep ^1300 | \
-  grep -v nan | $DIFF - $BASEDIR/dcounter1.output
+  grep -v nan | $DIFF9 - $BASEDIR/dcounter1.output
 report "fetch"
diff --git a/tests/functions b/tests/functions
index 0b081652..cdb286f0 100644
--- a/tests/functions
+++ b/tests/functions
@@ -9,6 +9,11 @@ BUILDDIR="${BUILDDIR:-${BASEDIR}}"
 TOP_BUILDDIR="${TOP_BUILDDIR:-${BASEDIR}/..}"
 
 DIFF="diff -u"
+DIFF9=seddif
+
+function seddif {
+   sed -e "s/\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)[0-9]\(e+[0-9]\)/\1\2/g" | $DIFF $@
+}
 
 #
 # because valgrind has trouble with glib memory handling
diff --git a/tests/modify-test1.create.dump b/tests/modify-test1.create.dump
index af422d61..d279c388 100644
--- a/tests/modify-test1.create.dump
+++ b/tests/modify-test1.create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,23 +29,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -57,23 +57,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify-test1.mod1.dump b/tests/modify-test1.mod1.dump
index f21b8252..8cbd5a08 100644
--- a/tests/modify-test1.mod1.dump
+++ b/tests/modify-test1.mod1.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,33 +29,33 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -67,23 +67,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify-test3.create.dump b/tests/modify-test3.create.dump
index 5c9b242f..f148e4fd 100644
--- a/tests/modify-test3.create.dump
+++ b/tests/modify-test3.create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -23,12 +23,12 @@
 		<name> b </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>10510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -36,12 +36,12 @@
 		<name> c </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>20510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -55,35 +55,35 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>1.0510000000e+04</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>1.051000000e+04</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>2.0510000000e+04</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>2.051000000e+04</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v><v>1.0430000000e+04</v><v>2.0430000000e+04</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v><v>1.0440000000e+04</v><v>2.0440000000e+04</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v><v>1.0450000000e+04</v><v>2.0450000000e+04</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v><v>1.0460000000e+04</v><v>2.0460000000e+04</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v><v>1.0470000000e+04</v><v>2.0470000000e+04</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v><v>1.0480000000e+04</v><v>2.0480000000e+04</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v><v>1.0490000000e+04</v><v>2.0490000000e+04</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v><v>1.0500000000e+04</v><v>2.0500000000e+04</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v><v>1.0510000000e+04</v><v>2.0510000000e+04</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v><v>1.043000000e+04</v><v>2.043000000e+04</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v><v>1.044000000e+04</v><v>2.044000000e+04</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v><v>1.045000000e+04</v><v>2.045000000e+04</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v><v>1.046000000e+04</v><v>2.046000000e+04</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v><v>1.047000000e+04</v><v>2.047000000e+04</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v><v>1.048000000e+04</v><v>2.048000000e+04</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v><v>1.049000000e+04</v><v>2.049000000e+04</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v><v>1.050000000e+04</v><v>2.050000000e+04</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v><v>1.051000000e+04</v><v>2.051000000e+04</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -95,35 +95,35 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>1.0470000000e+04</primary_value>
-			<secondary_value>1.0490000000e+04</secondary_value>
-			<value>2.1010000000e+04</value>
+			<primary_value>1.047000000e+04</primary_value>
+			<secondary_value>1.049000000e+04</secondary_value>
+			<value>2.101000000e+04</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>2.0470000000e+04</primary_value>
-			<secondary_value>2.0490000000e+04</secondary_value>
-			<value>4.1010000000e+04</value>
+			<primary_value>2.047000000e+04</primary_value>
+			<secondary_value>2.049000000e+04</secondary_value>
+			<value>4.101000000e+04</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v><v>1.0030000000e+04</v><v>2.0030000000e+04</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v><v>1.0070000000e+04</v><v>2.0070000000e+04</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v><v>1.0120000000e+04</v><v>2.0120000000e+04</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v><v>1.0170000000e+04</v><v>2.0170000000e+04</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v><v>1.0220000000e+04</v><v>2.0220000000e+04</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v><v>1.0270000000e+04</v><v>2.0270000000e+04</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v><v>1.0320000000e+04</v><v>2.0320000000e+04</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v><v>1.0470000000e+04</v><v>2.0470000000e+04</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v><v>1.003000000e+04</v><v>2.003000000e+04</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v><v>1.007000000e+04</v><v>2.007000000e+04</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v><v>1.012000000e+04</v><v>2.012000000e+04</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v><v>1.017000000e+04</v><v>2.017000000e+04</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v><v>1.022000000e+04</v><v>2.022000000e+04</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v><v>1.027000000e+04</v><v>2.027000000e+04</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v><v>1.032000000e+04</v><v>2.032000000e+04</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v><v>1.047000000e+04</v><v>2.047000000e+04</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify-test3.mod1.dump b/tests/modify-test3.mod1.dump
index 055b03a9..897cab7d 100644
--- a/tests/modify-test3.mod1.dump
+++ b/tests/modify-test3.mod1.dump
@@ -10,12 +10,12 @@
 		<name> b </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>10510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -23,12 +23,12 @@
 		<name> c </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>20510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -42,39 +42,39 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>1.0510000000e+04</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>1.051000000e+04</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>2.0510000000e+04</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>2.051000000e+04</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>1.0320000000e+04</v><v>2.0320000000e+04</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>1.0320000000e+04</v><v>2.0320000000e+04</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>1.0320000000e+04</v><v>2.0320000000e+04</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>1.0430000000e+04</v><v>2.0430000000e+04</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>1.0440000000e+04</v><v>2.0440000000e+04</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>1.0450000000e+04</v><v>2.0450000000e+04</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>1.0460000000e+04</v><v>2.0460000000e+04</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>1.0470000000e+04</v><v>2.0470000000e+04</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>1.0480000000e+04</v><v>2.0480000000e+04</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>1.0490000000e+04</v><v>2.0490000000e+04</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>1.0500000000e+04</v><v>2.0500000000e+04</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>1.0510000000e+04</v><v>2.0510000000e+04</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>1.032000000e+04</v><v>2.032000000e+04</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>1.032000000e+04</v><v>2.032000000e+04</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>1.032000000e+04</v><v>2.032000000e+04</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>1.043000000e+04</v><v>2.043000000e+04</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>1.044000000e+04</v><v>2.044000000e+04</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>1.045000000e+04</v><v>2.045000000e+04</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>1.046000000e+04</v><v>2.046000000e+04</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>1.047000000e+04</v><v>2.047000000e+04</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>1.048000000e+04</v><v>2.048000000e+04</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>1.049000000e+04</v><v>2.049000000e+04</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>1.050000000e+04</v><v>2.050000000e+04</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>1.051000000e+04</v><v>2.051000000e+04</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -86,29 +86,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>1.0470000000e+04</primary_value>
-			<secondary_value>1.0490000000e+04</secondary_value>
-			<value>2.1010000000e+04</value>
+			<primary_value>1.047000000e+04</primary_value>
+			<secondary_value>1.049000000e+04</secondary_value>
+			<value>2.101000000e+04</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
-			<primary_value>2.0470000000e+04</primary_value>
-			<secondary_value>2.0490000000e+04</secondary_value>
-			<value>4.1010000000e+04</value>
+			<primary_value>2.047000000e+04</primary_value>
+			<secondary_value>2.049000000e+04</secondary_value>
+			<value>4.101000000e+04</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>1.0030000000e+04</v><v>2.0030000000e+04</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>1.0070000000e+04</v><v>2.0070000000e+04</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.0120000000e+04</v><v>2.0120000000e+04</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.0170000000e+04</v><v>2.0170000000e+04</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>1.0220000000e+04</v><v>2.0220000000e+04</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>1.0270000000e+04</v><v>2.0270000000e+04</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>1.0320000000e+04</v><v>2.0320000000e+04</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>1.0370000000e+04</v><v>2.0370000000e+04</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>1.0420000000e+04</v><v>2.0420000000e+04</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>1.0470000000e+04</v><v>2.0470000000e+04</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>1.003000000e+04</v><v>2.003000000e+04</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>1.007000000e+04</v><v>2.007000000e+04</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.012000000e+04</v><v>2.012000000e+04</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.017000000e+04</v><v>2.017000000e+04</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>1.022000000e+04</v><v>2.022000000e+04</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>1.027000000e+04</v><v>2.027000000e+04</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>1.032000000e+04</v><v>2.032000000e+04</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>1.037000000e+04</v><v>2.037000000e+04</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>1.042000000e+04</v><v>2.042000000e+04</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>1.047000000e+04</v><v>2.047000000e+04</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify1 b/tests/modify1
index 703b4f98..d6b288db 100755
--- a/tests/modify1
+++ b/tests/modify1
@@ -4,7 +4,7 @@
 
 BASE=$BASEDIR/modify-test1
 BUILD=$BUILDDIR/modify-test1
-DIFF="diff -u"
+
 $RRDTOOL create ${BUILD}a.rrd --start 1300000000 --step 60 DS:a:GAUGE:120:0:U  RRA:AVERAGE:0.5:1:10 RRA:AVERAGE:0.5:5:10 || fail create
 
 # add 50 values to 
@@ -14,11 +14,11 @@ for T in $(seq 1300000020 60 1300003020) ; do
 	let N=$N+10
 done
 
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}.create.dump 
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF9 - ${BASE}.create.dump 
 report "created content"
 
 # extend base RRA, refill from coarse RRA
 cp ${BUILD}a.rrd ${BUILD}b.rrd
 $RRDTOOL tune ${BUILD}b.rrd RRA#0:+10 || fail "tune"
-$RRDTOOL dump ${BUILD}b.rrd | $DIFF - ${BASE}.mod1.dump 
+$RRDTOOL dump ${BUILD}b.rrd | $DIFF9 - ${BASE}.mod1.dump 
 report "extend base RRA"
diff --git a/tests/modify2 b/tests/modify2
index 75084320..dbc02f01 100755
--- a/tests/modify2
+++ b/tests/modify2
@@ -14,16 +14,16 @@ for T in $(seq 1300000020 60 1300003020) ; do
 	let N=$N+10
 done
 
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF ${BASE}a-create.dump -
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF9 ${BASE}a-create.dump -
 report create
 
 cp ${BUILD}a.rrd ${BUILD}b.rrd
 $RRDTOOL tune ${BUILD}b.rrd RRA#1:+10 RRA#2:+10 RRA#3:+10 RRA#4:+10 || fail modify
-$RRDTOOL dump ${BUILD}b.rrd | $DIFF ${BASE}b-mod1.dump -
+$RRDTOOL dump ${BUILD}b.rrd | $DIFF9 ${BASE}b-mod1.dump -
 report "simultaneously extend aggregate RRAs"
 
 cp ${BUILD}a.rrd ${BUILD}c.rrd
 $RRDTOOL tune ${BUILD}c.rrd RRA:AVERAGE:0.5:2:10 || fail modify
-$RRDTOOL dump ${BUILD}c.rrd | $DIFF ${BASE}c-mod1.dump -
+$RRDTOOL dump ${BUILD}c.rrd | $DIFF9 ${BASE}c-mod1.dump -
 report "add RRA with intermediate pdp_cnt"
 
diff --git a/tests/modify2-testa-create.dump b/tests/modify2-testa-create.dump
index 4478ad9a..425243cd 100644
--- a/tests/modify2-testa-create.dump
+++ b/tests/modify2-testa-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -86,56 +86,56 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.000000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.000000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.000000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.000000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.000000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.000000000e+02</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.100000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.300000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.400000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.500000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.600000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.800000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.900000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.100000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.300000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.500000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.600000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.800000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.900000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.000000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.100000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.300000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.400000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.500000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.600000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.800000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.900000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.100000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.5000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.0000000000e+02</value>
+			<primary_value>4.500000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.000000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.5000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.500000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify2-testb-mod1.dump b/tests/modify2-testb-mod1.dump
index 6871be5f..27e943dd 100644
--- a/tests/modify2-testb-mod1.dump
+++ b/tests/modify2-testb-mod1.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -86,56 +86,56 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.000000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.000000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.000000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.000000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.000000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.000000000e+02</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.100000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.300000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.400000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.500000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.600000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.800000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.900000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.100000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.300000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.500000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.600000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.800000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.900000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.000000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.100000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.300000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.400000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.500000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.600000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.800000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.900000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.100000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,25 +147,25 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
 			<!-- 2011-03-13 08:00:00 CET / 1299999600 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -177,25 +177,25 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.5000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.0000000000e+02</value>
+			<primary_value>4.500000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.000000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
 			<!-- 2011-03-13 08:00:00 CET / 1299999600 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>2.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>5.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.5000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>2.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>5.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.000000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.500000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.500000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.000000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.500000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,25 +207,25 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
 			<!-- 2011-03-13 08:00:00 CET / 1299999600 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.400000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.900000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.900000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.400000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.900000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -237,25 +237,25 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
 			<!-- 2011-03-13 08:00:00 CET / 1299999600 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.000000000e+01</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.400000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.900000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.900000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.400000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.900000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify2-testc-mod1.dump b/tests/modify2-testc-mod1.dump
index 291e7ae9..191394c0 100644
--- a/tests/modify2-testc-mod1.dump
+++ b/tests/modify2-testc-mod1.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -86,56 +86,56 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.0000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.1000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>2.000000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>3.000000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>4.000000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>5.000000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>6.000000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>7.000000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>8.000000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>9.000000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>1.000000000e+02</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.100000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.300000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.400000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.500000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.600000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.700000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.800000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.900000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.100000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.200000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.300000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.500000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.600000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.700000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.800000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.900000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>3.000000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.100000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.300000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.400000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.500000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.600000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.700000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.800000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.900000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.100000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.5000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.0000000000e+02</value>
+			<primary_value>4.500000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.000000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.5000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.500000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.900000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -227,23 +227,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9500000000e+02</primary_value>
-			<secondary_value>5.0000000000e+02</secondary_value>
-			<value>5.1000000000e+02</value>
+			<primary_value>4.950000000e+02</primary_value>
+			<secondary_value>5.000000000e+02</secondary_value>
+			<value>5.100000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.9500000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.950000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify3 b/tests/modify3
index 9c3fc1db..a065fae0 100755
--- a/tests/modify3
+++ b/tests/modify3
@@ -13,11 +13,11 @@ for T in $(seq 1300000020 60 1300003020) ; do
 	let N=$N+10
 done
 
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}.create.dump && ok "create" || fail "create"
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF9 - ${BASE}.create.dump && ok "create" || fail "create"
 
 # extend base RRA, refill from coarse RRA
 cp ${BUILD}a.rrd ${BUILD}b.rrd
 $RRDTOOL tune ${BUILD}b.rrd DEL:a RRA#0:+10 || fail modify
 
-$RRDTOOL dump ${BUILD}b.rrd | $DIFF - ${BASE}.mod1.dump && ok "extend base RRA" || fail "extend base RRA"
+$RRDTOOL dump ${BUILD}b.rrd | $DIFF9 - ${BASE}.mod1.dump && ok "extend base RRA" || fail "extend base RRA"
 
diff --git a/tests/modify4 b/tests/modify4
index 363437c1..7e0f4a44 100755
--- a/tests/modify4
+++ b/tests/modify4
@@ -25,20 +25,20 @@ done
 $RRDTOOL update ${BUILD}a1.rrd --template a $UPDATE || fail update1
 $RRDTOOL update ${BUILD}a2.rrd --template a $UPDATE || fail update2
 
-$RRDTOOL dump ${BUILD}a1.rrd | $DIFF ${BASE}a1-create.dump -
+$RRDTOOL dump ${BUILD}a1.rrd | $DIFF9 ${BASE}a1-create.dump -
 report create 1
-$RRDTOOL dump ${BUILD}a2.rrd | $DIFF ${BASE}a2-create.dump -
+$RRDTOOL dump ${BUILD}a2.rrd | $DIFF9 ${BASE}a2-create.dump -
 report create 2
 
 cp ${BUILD}a2.rrd ${BUILD}b2.rrd
 $RRDTOOL tune ${BUILD}b2.rrd DELRRA:5 || fail modify
 
-$RRDTOOL dump ${BUILD}b2.rrd | $DIFF ${BASE}a1-create.dump -
+$RRDTOOL dump ${BUILD}b2.rrd | $DIFF9 ${BASE}a1-create.dump -
 report "remove additional RRA from second - must then be equal original first"
 
 cp ${BUILD}a1.rrd ${BUILD}b1.rrd
 $RRDTOOL tune ${BUILD}b1.rrd RRA:AVERAGE:0.5:4:10 || fail modify
 
-$RRDTOOL dump ${BUILD}b1.rrd | $DIFF ${BASE}a2-create.dump -
+$RRDTOOL dump ${BUILD}b1.rrd | $DIFF9 ${BASE}a2-create.dump -
 report "add additional RRA to first - must then be equal original second"
 
diff --git a/tests/modify4-testa-create.dump b/tests/modify4-testa-create.dump
index 43f79ba2..d8f75324 100644
--- a/tests/modify4-testa-create.dump
+++ b/tests/modify4-testa-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>490</last_ds>
-		<value>1.4700000000e+04</value>
+		<value>1.470000000e+04</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -88,54 +88,54 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.500000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.500000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.500000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.500000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.500000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.500000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.500000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.500000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.500000000e+01</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.050000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.150000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.250000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.350000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.450000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.550000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.650000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.750000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.850000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.950000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.050000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.150000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.250000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.350000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.450000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.550000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.650000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.750000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.850000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.950000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.050000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.250000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.450000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.650000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.850000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.050000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.250000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.450000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.650000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.6500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>0.0000000000e+00</value>
+			<primary_value>4.650000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.6500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.650000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.4500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
+			<primary_value>4.450000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
 			<value>inf</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.4500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.450000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
 			<value>-inf</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify4-testa1-create.dump b/tests/modify4-testa1-create.dump
index 4b4d6dde..e3953c94 100644
--- a/tests/modify4-testa1-create.dump
+++ b/tests/modify4-testa1-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>500</last_ds>
-		<value>1.5000000000e+04</value>
+		<value>1.500000000e+04</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9500000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>4.950000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -87,55 +87,55 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.9500000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.500000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.500000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.500000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.500000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.500000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.500000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.500000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.500000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.500000000e+01</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.050000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.150000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.250000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.350000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.450000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.550000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.650000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.750000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.850000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.950000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.050000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.150000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.250000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.350000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.450000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.550000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.650000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.750000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.850000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.950000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.050000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.250000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.450000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.650000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.850000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.050000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.250000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.450000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.650000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.950000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.6500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.650000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.6500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.650000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.4500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.450000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.4500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.450000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify4-testa2-create.dump b/tests/modify4-testa2-create.dump
index ee68143b..4d16d5e8 100644
--- a/tests/modify4-testa2-create.dump
+++ b/tests/modify4-testa2-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>500</last_ds>
-		<value>1.5000000000e+04</value>
+		<value>1.500000000e+04</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9500000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>4.950000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -87,55 +87,55 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.9500000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.500000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.500000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.500000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.500000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.500000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.500000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.500000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.500000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.500000000e+01</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.050000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.150000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.250000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.350000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.450000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.550000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.650000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.750000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.850000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.950000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.050000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.150000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.250000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.350000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.450000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.550000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.650000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.750000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.850000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.950000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.050000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.250000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.450000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.650000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.850000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.050000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.250000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.450000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.650000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.950000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.6500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.650000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.6500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.650000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.4500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.450000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.4500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.450000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -227,23 +227,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8000000000e+02</primary_value>
-			<secondary_value>4.9500000000e+02</secondary_value>
-			<value>0.0000000000e+00</value>
+			<primary_value>4.800000000e+02</primary_value>
+			<secondary_value>4.950000000e+02</secondary_value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.8000000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.600000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.800000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.600000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.800000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify5 b/tests/modify5
index 5befc5d4..d4349091 100755
--- a/tests/modify5
+++ b/tests/modify5
@@ -24,9 +24,9 @@ done
 $RRDTOOL update ${BUILD}a1.rrd --template a $UPDATE_STRING || fail update1
 $RRDTOOL update ${BUILD}a2.rrd --template a $UPDATE_STRING || fail update2
 
-$RRDTOOL dump ${BUILD}a1.rrd | $DIFF ${BASE}a1-create.dump -
+$RRDTOOL dump ${BUILD}a1.rrd | $DIFF9 ${BASE}a1-create.dump -
 report create 1
-$RRDTOOL dump ${BUILD}a2.rrd | $DIFF ${BASE}a2-create.dump -
+$RRDTOOL dump ${BUILD}a2.rrd | $DIFF9 ${BASE}a2-create.dump -
 report create 2
 
 for U in 1300003010:200 1300003070:102 1300003130:777 1300003190:645 1300003250:122 1300003310:981 1300003323:223 1300003381:721 1300003445:821 1300003500:221 1300003562:231 1300003637:542 1300003699:734 1300003769:9231 1300003823:17
@@ -37,20 +37,20 @@ do
 	$RRDTOOL update ${BUILD}a2.rrd --template a $U
 
 	# dump current state for later comparison
-	$RRDTOOL dump ${BUILD}a1.rrd > ${BUILD}a1-mod.dump
-	$RRDTOOL dump ${BUILD}a2.rrd > ${BUILD}a2-mod.dump
+	$RRDTOOL dump ${BUILD}a1.rrd > ${BUILD}a1-mod.dump.tmp
+	$RRDTOOL dump ${BUILD}a2.rrd > ${BUILD}a2-mod.dump.tmp
 	
 	# remove RRA 5 from second RRD, should now match first RRD
 	cp ${BUILD}a2.rrd ${BUILD}b2.rrd 
 	$RRDTOOL tune ${BUILD}b2.rrd DELRRA:5
 
-	$RRDTOOL dump ${BUILD}b2.rrd | $DIFF ${BUILD}a1-mod.dump -
+	$RRDTOOL dump ${BUILD}b2.rrd | diff -u ${BUILD}a1-mod.dump.tmp -
 	report "remove additional RRA from second - must then be equal original first"
 
         # add RRA to first RRD, should now match second RRD
 	cp ${BUILD}a1.rrd ${BUILD}b1.rrd
 	$RRDTOOL tune ${BUILD}b1.rrd RRA:AVERAGE:0.5:4:10
 
-	$RRDTOOL dump ${BUILD}b1.rrd | $DIFF ${BUILD}a2-mod.dump -
+	$RRDTOOL dump ${BUILD}b1.rrd | diff -u ${BUILD}a2-mod.dump.tmp -
 	report "add additional RRA to first - must then be equal original second"
 done
diff --git a/tests/modify5-testa1-create.dump b/tests/modify5-testa1-create.dump
index 4b4d6dde..e3953c94 100644
--- a/tests/modify5-testa1-create.dump
+++ b/tests/modify5-testa1-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>500</last_ds>
-		<value>1.5000000000e+04</value>
+		<value>1.500000000e+04</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9500000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>4.950000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -87,55 +87,55 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.9500000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.500000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.500000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.500000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.500000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.500000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.500000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.500000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.500000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.500000000e+01</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.050000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.150000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.250000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.350000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.450000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.550000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.650000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.750000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.850000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.950000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.050000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.150000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.250000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.350000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.450000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.550000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.650000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.750000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.850000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.950000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.050000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.250000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.450000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.650000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.850000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.050000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.250000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.450000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.650000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.950000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.6500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.650000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.6500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.650000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.4500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.450000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.4500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.450000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/modify5-testa2-create.dump b/tests/modify5-testa2-create.dump
index ee68143b..4d16d5e8 100644
--- a/tests/modify5-testa2-create.dump
+++ b/tests/modify5-testa2-create.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>500</last_ds>
-		<value>1.5000000000e+04</value>
+		<value>1.500000000e+04</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -29,8 +29,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.9500000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>4.950000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
@@ -87,55 +87,55 @@
 			<!-- 2011-03-13 08:05:00 CET / 1299999900 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:06:00 CET / 1299999960 --> <row><v>NaN</v></row>
 			<!-- 2011-03-13 08:07:00 CET / 1300000020 --> <row><v>NaN</v></row>
-			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.5000000000e+01</v></row>
-			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.0500000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.2500000000e+02</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.4500000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.5500000000e+02</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.6500000000e+02</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.7500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.9500000000e+02</v></row>
+			<!-- 2011-03-13 08:08:00 CET / 1300000080 --> <row><v>1.500000000e+01</v></row>
+			<!-- 2011-03-13 08:09:00 CET / 1300000140 --> <row><v>2.500000000e+01</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.500000000e+01</v></row>
+			<!-- 2011-03-13 08:11:00 CET / 1300000260 --> <row><v>4.500000000e+01</v></row>
+			<!-- 2011-03-13 08:12:00 CET / 1300000320 --> <row><v>5.500000000e+01</v></row>
+			<!-- 2011-03-13 08:13:00 CET / 1300000380 --> <row><v>6.500000000e+01</v></row>
+			<!-- 2011-03-13 08:14:00 CET / 1300000440 --> <row><v>7.500000000e+01</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>8.500000000e+01</v></row>
+			<!-- 2011-03-13 08:16:00 CET / 1300000560 --> <row><v>9.500000000e+01</v></row>
+			<!-- 2011-03-13 08:17:00 CET / 1300000620 --> <row><v>1.050000000e+02</v></row>
+			<!-- 2011-03-13 08:18:00 CET / 1300000680 --> <row><v>1.150000000e+02</v></row>
+			<!-- 2011-03-13 08:19:00 CET / 1300000740 --> <row><v>1.250000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.350000000e+02</v></row>
+			<!-- 2011-03-13 08:21:00 CET / 1300000860 --> <row><v>1.450000000e+02</v></row>
+			<!-- 2011-03-13 08:22:00 CET / 1300000920 --> <row><v>1.550000000e+02</v></row>
+			<!-- 2011-03-13 08:23:00 CET / 1300000980 --> <row><v>1.650000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.750000000e+02</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.850000000e+02</v></row>
+			<!-- 2011-03-13 08:26:00 CET / 1300001160 --> <row><v>1.950000000e+02</v></row>
+			<!-- 2011-03-13 08:27:00 CET / 1300001220 --> <row><v>2.050000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.150000000e+02</v></row>
+			<!-- 2011-03-13 08:29:00 CET / 1300001340 --> <row><v>2.250000000e+02</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.350000000e+02</v></row>
+			<!-- 2011-03-13 08:31:00 CET / 1300001460 --> <row><v>2.450000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.550000000e+02</v></row>
+			<!-- 2011-03-13 08:33:00 CET / 1300001580 --> <row><v>2.650000000e+02</v></row>
+			<!-- 2011-03-13 08:34:00 CET / 1300001640 --> <row><v>2.750000000e+02</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.850000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.950000000e+02</v></row>
+			<!-- 2011-03-13 08:37:00 CET / 1300001820 --> <row><v>3.050000000e+02</v></row>
+			<!-- 2011-03-13 08:38:00 CET / 1300001880 --> <row><v>3.150000000e+02</v></row>
+			<!-- 2011-03-13 08:39:00 CET / 1300001940 --> <row><v>3.250000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.350000000e+02</v></row>
+			<!-- 2011-03-13 08:41:00 CET / 1300002060 --> <row><v>3.450000000e+02</v></row>
+			<!-- 2011-03-13 08:42:00 CET / 1300002120 --> <row><v>3.550000000e+02</v></row>
+			<!-- 2011-03-13 08:43:00 CET / 1300002180 --> <row><v>3.650000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.750000000e+02</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.850000000e+02</v></row>
+			<!-- 2011-03-13 08:46:00 CET / 1300002360 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:47:00 CET / 1300002420 --> <row><v>4.050000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.250000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.450000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.550000000e+02</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.650000000e+02</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.750000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.950000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -147,15 +147,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.6500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.650000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.1500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.6500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.150000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.650000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -167,15 +167,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.4500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.450000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.9500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.4500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>3.950000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.450000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -187,15 +187,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -207,15 +207,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8500000000e+02</primary_value>
-			<secondary_value>4.8500000000e+02</secondary_value>
-			<value>4.9500000000e+02</value>
+			<primary_value>4.850000000e+02</primary_value>
+			<secondary_value>4.850000000e+02</secondary_value>
+			<value>4.950000000e+02</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.3500000000e+02</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.8500000000e+02</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.350000000e+02</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.850000000e+02</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -227,23 +227,23 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.8000000000e+02</primary_value>
-			<secondary_value>4.9500000000e+02</secondary_value>
-			<value>0.0000000000e+00</value>
+			<primary_value>4.800000000e+02</primary_value>
+			<secondary_value>4.950000000e+02</secondary_value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.8000000000e+02</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v></row>
-			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.6000000000e+02</v></row>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.0000000000e+02</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.4000000000e+02</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.8000000000e+02</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v></row>
+			<!-- 2011-03-13 08:24:00 CET / 1300001040 --> <row><v>1.600000000e+02</v></row>
+			<!-- 2011-03-13 08:28:00 CET / 1300001280 --> <row><v>2.000000000e+02</v></row>
+			<!-- 2011-03-13 08:32:00 CET / 1300001520 --> <row><v>2.400000000e+02</v></row>
+			<!-- 2011-03-13 08:36:00 CET / 1300001760 --> <row><v>2.800000000e+02</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v></row>
+			<!-- 2011-03-13 08:44:00 CET / 1300002240 --> <row><v>3.600000000e+02</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.000000000e+02</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.400000000e+02</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>4.800000000e+02</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/rpn1 b/tests/rpn1
index a295095d..a7790952 100755
--- a/tests/rpn1
+++ b/tests/rpn1
@@ -25,5 +25,5 @@ $RRDTOOL graphv -                          \
       VDEF:o=over,MINIMUM \
       PRINT:f:'%lf' \
       PRINT:g:'%lf' \
-      PRINT:o:'%lf' | $DIFF - $BASEDIR/rpn1.output
+      PRINT:o:'%lf' | $DIFF9 - $BASEDIR/rpn1.output
 report "graphv"
diff --git a/tests/rrdcreate b/tests/rrdcreate
index 4d34e3d4..24b3a0b5 100755
--- a/tests/rrdcreate
+++ b/tests/rrdcreate
@@ -105,7 +105,7 @@ checkequiv () {
     echo "OK: ${desc}"
   else
     echo "FAIL ${desc}:"
-    diff -u ${f1} ${f2}
+    $DIFF ${f1} ${f2}
   fi
 }
 
diff --git a/tests/tune1 b/tests/tune1
index 14cb4ce4..a156a65c 100755
--- a/tests/tune1
+++ b/tests/tune1
@@ -24,7 +24,7 @@ is_cached && ( $RRDTOOL flushcached ${BUILD}org.rrd || fail flushcached)
 cp ${BUILD}org.rrd ${BUILD}a.rrd
 $RRDTOOL tune ${BUILD}a.rrd --heartbeat a:90 --minimum b:U
 $RRDTOOL tune ${BUILD}a.rrd --heartbeat a:90 --minimum b:-100
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}a-mod1.dump
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF9 - ${BASE}a-mod1.dump
 report "tune heartbeat/minimum" 
 
 # NOTE: for rrdcached based tests, we must flush before we can copy...
@@ -32,6 +32,6 @@ is_cached && ( $RRDTOOL flushcached ${BUILD}org.rrd || fail flushcached )
 
 cp ${BUILD}org.rrd ${BUILD}a.rrd
 $RRDTOOL tune ${BUILD}a.rrd --data-source-type a:COUNTER --data-source-rename b:c
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}a-mod2.dump
+$RRDTOOL dump ${BUILD}a.rrd | $DIFF9 - ${BASE}a-mod2.dump
 report "tune dst/ds-name" 
 
diff --git a/tests/tune1-testa-mod1.dump b/tests/tune1-testa-mod1.dump
index 249508ce..5008f74f 100644
--- a/tests/tune1-testa-mod1.dump
+++ b/tests/tune1-testa-mod1.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>90</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -23,7 +23,7 @@
 		<name> b </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>-1.0000000000e+02</min>
+		<min>-1.000000000e+02</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -42,29 +42,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -76,29 +76,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
 			<secondary_value>NaN</secondary_value>
-			<value>0.0000000000e+00</value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>2</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/tune1-testa-mod2.dump b/tests/tune1-testa-mod2.dump
index c4a4fcb4..64bae281 100644
--- a/tests/tune1-testa-mod2.dump
+++ b/tests/tune1-testa-mod2.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>UNKN</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -23,7 +23,7 @@
 		<name> c </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -42,29 +42,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -76,29 +76,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
 			<secondary_value>NaN</secondary_value>
-			<value>0.0000000000e+00</value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>2</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/tune1-testorg.dump b/tests/tune1-testorg.dump
index 54844717..b67f5a54 100644
--- a/tests/tune1-testorg.dump
+++ b/tests/tune1-testorg.dump
@@ -10,12 +10,12 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
 		<last_ds>510</last_ds>
-		<value>0.0000000000e+00</value>
+		<value>0.000000000e+00</value>
 		<unknown_sec> 0 </unknown_sec>
 	</ds>
 
@@ -23,7 +23,7 @@
 		<name> b </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -42,29 +42,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>5.1000000000e+02</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>5.100000000e+02</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<value>NaN</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.3000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.4000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.5000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.6000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.8000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.9000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.0000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.1000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:48:00 CET / 1300002480 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:49:00 CET / 1300002540 --> <row><v>4.300000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.400000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:51:00 CET / 1300002660 --> <row><v>4.500000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:52:00 CET / 1300002720 --> <row><v>4.600000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:53:00 CET / 1300002780 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:54:00 CET / 1300002840 --> <row><v>4.800000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.900000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:56:00 CET / 1300002960 --> <row><v>5.000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:57:00 CET / 1300003020 --> <row><v>5.100000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 	<rra>
@@ -76,29 +76,29 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>4.7000000000e+02</primary_value>
-			<secondary_value>4.9000000000e+02</secondary_value>
-			<value>1.0100000000e+03</value>
+			<primary_value>4.700000000e+02</primary_value>
+			<secondary_value>4.900000000e+02</secondary_value>
+			<value>1.010000000e+03</value>
 			<unknown_datapoints>0</unknown_datapoints>
 			</ds>
 			<ds>
 			<primary_value>NaN</primary_value>
 			<secondary_value>NaN</secondary_value>
-			<value>0.0000000000e+00</value>
+			<value>0.000000000e+00</value>
 			<unknown_datapoints>2</unknown_datapoints>
 			</ds>
 		</cdp_prep>
 		<database>
-			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.0000000000e+01</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.7000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.2000000000e+02</v><v>NaN</v></row>
-			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.7000000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:10:00 CET / 1300000200 --> <row><v>3.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:15:00 CET / 1300000500 --> <row><v>7.000000000e+01</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:20:00 CET / 1300000800 --> <row><v>1.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:25:00 CET / 1300001100 --> <row><v>1.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:30:00 CET / 1300001400 --> <row><v>2.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:35:00 CET / 1300001700 --> <row><v>2.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:40:00 CET / 1300002000 --> <row><v>3.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:45:00 CET / 1300002300 --> <row><v>3.700000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:50:00 CET / 1300002600 --> <row><v>4.200000000e+02</v><v>NaN</v></row>
+			<!-- 2011-03-13 08:55:00 CET / 1300002900 --> <row><v>4.700000000e+02</v><v>NaN</v></row>
 		</database>
 	</rra>
 </rrd>
diff --git a/tests/tune2 b/tests/tune2
index f720dd1d..f8a9b226 100755
--- a/tests/tune2
+++ b/tests/tune2
@@ -5,10 +5,10 @@
 BASE=$BASEDIR/tune2-test
 BUILD=$BUILDDIR/tune2-test
 
-DIFF='diff -u -I .*<seasonal_smooth_idx>.*'
+xDIFF9="${DIFF9} -I .*<seasonal_smooth_idx>.*"
 
 $RRDTOOL create ${BUILD}org.rrd --start 1300000000 --step 60 DS:a:GAUGE:120:0:U DS:b:COUNTER:120:0:U RRA:HWPREDICT:288:0.9:0.8:144
-$RRDTOOL dump ${BUILD}org.rrd | $DIFF - ${BASE}org.dump
+$RRDTOOL dump ${BUILD}org.rrd | $xDIFF9 - ${BASE}org.dump
 report create
 
 is_cached && ( $RRDTOOL flushcached ${BUILD}org.rrd || fail flushcached )
@@ -16,10 +16,10 @@ cp ${BUILD}org.rrd ${BUILD}a.rrd
 # this must fail
 ! $RRDTOOL tune ${BUILD}a.rrd --beta 1.4 2>/dev/null
 report "out of range beta error"
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}org.dump
+$RRDTOOL dump ${BUILD}a.rrd | $xDIFF9 - ${BASE}org.dump
 report "RRD unchanged"
 
 $RRDTOOL tune ${BUILD}a.rrd --beta 0.4 
-$RRDTOOL dump ${BUILD}a.rrd | $DIFF - ${BASE}a-mod1.dump
+$RRDTOOL dump ${BUILD}a.rrd | $xDIFF9 - ${BASE}a-mod1.dump
 report "tune beta"
 
diff --git a/tests/tune2-testa-mod1.dump b/tests/tune2-testa-mod1.dump
index 66f43eab..e504af0c 100644
--- a/tests/tune2-testa-mod1.dump
+++ b/tests/tune2-testa-mod1.dump
@@ -10,7 +10,7 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -23,7 +23,7 @@
 		<name> b </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -44,8 +44,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<intercept>NaN</intercept>
 			<last_intercept>NaN</last_intercept>
 			<slope>NaN</slope>
@@ -54,8 +54,8 @@
 			<last_nan_count>1</last_nan_count>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<intercept>NaN</intercept>
 			<last_intercept>NaN</last_intercept>
 			<slope>NaN</slope>
@@ -366,15 +366,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
@@ -538,15 +538,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
@@ -708,12 +708,12 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			</ds>
 		</cdp_prep>
 		<database>
@@ -1012,21 +1012,21 @@
 		<pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
 		<params>
-		<delta_pos>2.0000000000e+00</delta_pos>
-		<delta_neg>2.0000000000e+00</delta_neg>
+		<delta_pos>2.000000000e+00</delta_pos>
+		<delta_neg>2.000000000e+00</delta_neg>
 		<window_len>9</window_len>
 		<failure_threshold>7</failure_threshold>
 		<dependent_rra_idx>2</dependent_rra_idx>
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<history>000000000</history>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<history>000000000</history>
 			</ds>
 		</cdp_prep>
diff --git a/tests/tune2-testorg.dump b/tests/tune2-testorg.dump
index 37b87f20..b4aa19cd 100644
--- a/tests/tune2-testorg.dump
+++ b/tests/tune2-testorg.dump
@@ -10,7 +10,7 @@
 		<name> a </name>
 		<type> GAUGE </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -23,7 +23,7 @@
 		<name> b </name>
 		<type> COUNTER </type>
 		<minimal_heartbeat>120</minimal_heartbeat>
-		<min>0.0000000000e+00</min>
+		<min>0.000000000e+00</min>
 		<max>NaN</max>
 
 		<!-- PDP Status -->
@@ -44,8 +44,8 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<intercept>NaN</intercept>
 			<last_intercept>NaN</last_intercept>
 			<slope>NaN</slope>
@@ -54,8 +54,8 @@
 			<last_nan_count>1</last_nan_count>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<intercept>NaN</intercept>
 			<last_intercept>NaN</last_intercept>
 			<slope>NaN</slope>
@@ -366,15 +366,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
@@ -538,15 +538,15 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<seasonal>NaN</seasonal>
 			<last_seasonal>NaN</last_seasonal>
 			<init_flag>1</init_flag>
@@ -708,12 +708,12 @@
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			</ds>
 		</cdp_prep>
 		<database>
@@ -1012,21 +1012,21 @@
 		<pdp_per_row>1</pdp_per_row> <!-- 60 seconds -->
 
 		<params>
-		<delta_pos>2.0000000000e+00</delta_pos>
-		<delta_neg>2.0000000000e+00</delta_neg>
+		<delta_pos>2.000000000e+00</delta_pos>
+		<delta_neg>2.000000000e+00</delta_neg>
 		<window_len>9</window_len>
 		<failure_threshold>7</failure_threshold>
 		<dependent_rra_idx>2</dependent_rra_idx>
 		</params>
 		<cdp_prep>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<history>000000000</history>
 			</ds>
 			<ds>
-			<primary_value>0.0000000000e+00</primary_value>
-			<secondary_value>0.0000000000e+00</secondary_value>
+			<primary_value>0.000000000e+00</primary_value>
+			<secondary_value>0.000000000e+00</secondary_value>
 			<history>000000000</history>
 			</ds>
 		</cdp_prep>
diff --git a/tests/vformatter1 b/tests/vformatter1
index 2cf54e7c..6658f229 100755
--- a/tests/vformatter1
+++ b/tests/vformatter1
@@ -8,7 +8,7 @@ function rtest() {
     testname="$1"
     xpected="$2"
     shift 2 || exit 1
-    diff -u <(echo -e "$xpected") <($RRDTOOL "$@")
+    $DIFF <(echo -e "$xpected") <($RRDTOOL "$@")
     report "$testname"
     #&& echo "OK: $testname" || echo "FAIL: $testname"
 }