diff --git a/dives/test47.xml b/dives/test47.xml
new file mode 100644
index 000000000..0b93f1142
--- /dev/null
+++ b/dives/test47.xml
@@ -0,0 +1,22 @@
+<divelog program='subsurface' version='3'>
+<settings>
+</settings>
+<divesites>
+<site uuid='15ae02d0' name='Test dive'>
+</site>
+</divesites>
+<dives>
+<dive number='1' divesiteid='15ae02d0' date='2015-10-01' time='08:00:25' duration='46:00 min'>
+  <cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
+  <divecomputer model='do not care' date='2015-10-05' time='08:45:25'>
+  <depth max='13.716 m' mean='10.595 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='0:36 min' depth='13.716 m' />
+  <sample time='20:00 min' depth='13.716 m' />
+  <sample time='42:00 min' depth='4.572 m' />
+  <sample time='45:00 min' depth='4.572 m' />
+  <sample time='46:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+</dives>
+</divelog>
diff --git a/dives/test47b.xml b/dives/test47b.xml
new file mode 100644
index 000000000..6ed1c057d
--- /dev/null
+++ b/dives/test47b.xml
@@ -0,0 +1,22 @@
+<divelog program='subsurface' version='3'>
+<settings>
+</settings>
+<divesites>
+<site uuid='cb2d5719' name='Test dive from second file'>
+</site>
+</divesites>
+<dives>
+<dive divesiteid='cb2d5719' date='2015-10-01' time='08:00:25' duration='46:00 min'>
+  <cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
+  <divecomputer model='do not care' date='2015-10-05' time='08:45:25'>
+  <depth max='13.716 m' mean='10.595 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='0:36 min' depth='13.716 m' />
+  <sample time='20:00 min' depth='13.716 m' />
+  <sample time='42:00 min' depth='4.572 m' />
+  <sample time='45:00 min' depth='4.572 m' />
+  <sample time='46:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+</dives>
+</divelog>
diff --git a/dives/test47c.xml b/dives/test47c.xml
new file mode 100644
index 000000000..0fd6be0a3
--- /dev/null
+++ b/dives/test47c.xml
@@ -0,0 +1,36 @@
+<divelog program='subsurface' version='3'>
+<settings>
+</settings>
+<divesites>
+<site uuid='4f6eef08' name='New test site'>
+</site>
+<site uuid='cb2d5719' name='Test dive from second file'>
+</site>
+</divesites>
+<dives>
+<dive divesiteid='cb2d5719' date='2015-10-01' time='08:00:25' duration='46:00 min'>
+  <cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
+  <divecomputer model='do not care' date='2015-10-05' time='08:45:25'>
+  <depth max='13.716 m' mean='10.595 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='0:36 min' depth='13.716 m' />
+  <sample time='20:00 min' depth='13.716 m' />
+  <sample time='42:00 min' depth='4.572 m' />
+  <sample time='45:00 min' depth='4.572 m' />
+  <sample time='46:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+<dive divesiteid='4f6eef08' date='2015-10-05' time='08:00:05' duration='46:00 min'>
+  <cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
+  <divecomputer model='do not care' date='2015-10-05' time='08:48:05'>
+  <depth max='13.716 m' mean='10.595 m' />
+  <sample time='0:00 min' depth='0.0 m' />
+  <sample time='0:36 min' depth='13.716 m' />
+  <sample time='20:00 min' depth='13.716 m' />
+  <sample time='42:00 min' depth='4.572 m' />
+  <sample time='45:00 min' depth='4.572 m' />
+  <sample time='46:00 min' depth='0.0 m' />
+  </divecomputer>
+</dive>
+</dives>
+</divelog>