diff --git a/dives/TestDiveSeabearNewFormat.xml b/dives/TestDiveSeabearNewFormat.xml
index 3a9a58a61..1b703f97e 100644
--- a/dives/TestDiveSeabearNewFormat.xml
+++ b/dives/TestDiveSeabearNewFormat.xml
@@ -4,7 +4,7 @@
 <divesites>
 </divesites>
 <dives>
-<dive number='2' date='2012-10-01' time='06:22:00' duration='16:25 min'>
+<dive number='2' otu='14' cns='8%' date='2012-10-01' time='06:22:00' duration='16:25 min'>
   <divecomputer model='Seabear H3' dctype='CCR'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
@@ -211,7 +211,7 @@
   <sample time='17:15 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='3' otu='14' cns='8%' date='2012-10-01' time='06:49:00' duration='16:25 min'>
+<dive number='3' otu='14' cns='15%' date='2012-10-01' time='06:49:00' duration='16:25 min'>
   <divecomputer model='Seabear H3'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
@@ -418,7 +418,7 @@
   <sample time='17:15 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='4' otu='14' cns='16%' date='2012-10-01' time='07:07:00' duration='16:17 min'>
+<dive number='4' otu='14' cns='23%' date='2012-10-01' time='07:07:00' duration='16:17 min'>
   <divecomputer model='Seabear H3' dctype='Freedive'>
   <depth max='70.1 m' mean='33.197 m' />
   <temperature water='25.0 C' />
@@ -1351,7 +1351,7 @@
   <sample time='16:24 min' depth='0.1 m' />
   </divecomputer>
 </dive>
-<dive number='5' otu='14' cns='24%' date='2012-10-01' time='07:24:00' duration='16:25 min'>
+<dive number='5' otu='14' cns='31%' date='2012-10-01' time='07:24:00' duration='16:25 min'>
   <divecomputer model='Seabear H3'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
@@ -1766,7 +1766,7 @@
   <sample time='17:15 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='2' cns='5%' date='2012-10-01' time='06:22:00' duration='16:25 min'>
+<dive number='2' otu='14' cns='13%' date='2012-10-01' time='06:22:00' duration='16:25 min'>
   <divecomputer model='Seabear T1' dctype='CCR'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
@@ -1973,7 +1973,7 @@
   <sample time='17:15 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='3' otu='14' cns='12%' date='2012-10-01' time='06:49:00' duration='16:25 min'>
+<dive number='3' otu='14' cns='20%' date='2012-10-01' time='06:49:00' duration='16:25 min'>
   <divecomputer model='Seabear T1'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
@@ -2180,7 +2180,7 @@
   <sample time='17:15 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='4' otu='14' cns='20%' date='2012-10-01' time='07:07:00' duration='16:17 min'>
+<dive number='4' otu='14' cns='27%' date='2012-10-01' time='07:07:00' duration='16:17 min'>
   <divecomputer model='Seabear T1' dctype='Freedive'>
   <depth max='70.1 m' mean='33.197 m' />
   <temperature water='24.0 C' />
@@ -3113,7 +3113,7 @@
   <sample time='16:24 min' depth='0.1 m' />
   </divecomputer>
 </dive>
-<dive number='5' otu='14' cns='28%' date='2012-10-01' time='07:24:00' duration='16:25 min'>
+<dive number='5' otu='14' cns='35%' date='2012-10-01' time='07:24:00' duration='16:25 min'>
   <divecomputer model='Seabear T1'>
   <depth max='69.9 m' mean='32.928 m' />
   <temperature water='25.0 C' />
diff --git a/dives/test40-42.xml b/dives/test40-42.xml
index 29f31f8c3..070eb3ced 100644
--- a/dives/test40-42.xml
+++ b/dives/test40-42.xml
@@ -771,7 +771,7 @@
   <sample time='114:40 min' depth='0.0 m' />
   </divecomputer>
 </dive>
-<dive number='1' sac='1.049 l/min' otu='95' cns='34%' date='2014-04-01' time='10:00:00' duration='77:54 min'>
+<dive number='1' sac='1.049 l/min' otu='97' cns='34%' date='2014-04-01' time='10:00:00' duration='77:54 min'>
   <notes>CCR dive</notes>
   <cylinder size='2.0 l' workpressure='232.0 bar' description='Oxy2' o2='100.0%' start='190.0 bar' end='130.0 bar' use='oxygen' />
   <cylinder size='2.0 l' workpressure='232.0 bar' description='Dil2' start='185.0 bar' end='130.0 bar' use='diluent' />
@@ -3268,7 +3268,7 @@
   <sample time='82:50 min' depth='0.235 m' ndl='0:00 min' stoptime='0:00 min' cns='0%' po2='0.0 bar' />
   </divecomputer>
 </dive>
-<dive number='1' sac='1.049 l/min' otu='95' cns='34%' date='2014-04-02' time='10:00:00' duration='77:54 min'>
+<dive number='1' sac='1.049 l/min' otu='97' cns='34%' date='2014-04-02' time='10:00:00' duration='77:54 min'>
   <notes>CCR dive</notes>
   <cylinder size='2.0 l' workpressure='232.0 bar' description='Oxy2' o2='100.0%' start='190.0 bar' end='130.0 bar' use='oxygen' />
   <cylinder size='2.0 l' workpressure='232.0 bar' description='Dil2' start='185.0 bar' end='130.0 bar' use='diluent' />