diff --git a/dives/test10.xml b/dives/test10.xml
new file mode 100644
index 000000000..3e32914b9
--- /dev/null
+++ b/dives/test10.xml
@@ -0,0 +1,13 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<dive number='10' date='2011-01-01' time='18:00:00' duration='30:00 min'>
+  <depth max='30.0 m' mean='15.0 m' />
+  <temperature air='27.0 C' water='26.0 C' />
+  <location>10th test dive, 3 tanks, 1 tank change</location>
+  <notes>Shows two pressure plots, each from 200 to 100bar and gaschange event at 10 min mark.</notes>
+  <cylinder o2='33.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='50.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='75.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <event time='10:00 min' name='gaschange' value='50' />
+</dive>
+</dives>
diff --git a/dives/test11.xml b/dives/test11.xml
new file mode 100644
index 000000000..4bd52e0c0
--- /dev/null
+++ b/dives/test11.xml
@@ -0,0 +1,14 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<dive number='11' date='2011-01-01' time='19:00:00' duration='30:00 min'>
+  <depth max='30.0 m' mean='15.0 m' />
+  <temperature air='27.0 C' water='26.0 C' />
+  <location>10th test dive, 3 tanks, 2 tank changes</location>
+  <notes>Shows three pressure plots, each from 200 to 100bar and gaschange events at 10 and 20 min mark.</notes>
+  <cylinder o2='33.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='50.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='75.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <event time='10:00 min' name='gaschange' value='50' />
+  <event time='20:00 min' name='gaschange' value='75' />
+</dive>
+</dives>
diff --git a/dives/test12.xml b/dives/test12.xml
new file mode 100644
index 000000000..efaad6871
--- /dev/null
+++ b/dives/test12.xml
@@ -0,0 +1,15 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<dive number='12' date='2011-01-01' time='20:00:00' duration='30:00 min'>
+  <depth max='30.0 m' mean='15.0 m' />
+  <temperature air='27.0 C' water='26.0 C' />
+  <location>10th test dive, 3 tanks, 3 tank changes</location>
+  <notes>Shows three pressure plots, each from 200 to 100bar and gaschange events at 10, 20 and 25 min mark. Last change is back to first tank.</notes>
+  <cylinder o2='33.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='50.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='75.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <event time='10:00 min' name='gaschange' value='50' />
+  <event time='20:00 min' name='gaschange' value='75' />
+  <event time='25:00 min' name='gaschange' value='33' />
+</dive>
+</dives>
diff --git a/dives/test13.xml b/dives/test13.xml
new file mode 100644
index 000000000..e5555d854
--- /dev/null
+++ b/dives/test13.xml
@@ -0,0 +1,46 @@
+<dives>
+<program name='subsurface' version='1'></program>
+<dive number='13' date='2011-01-01' time='21:00:00' duration='30:00 min'>
+  <depth max='30.0 m' mean='15.0 m' />
+  <temperature air='27.0 C' water='26.0 C' />
+  <location>10th test dive, 3 tanks, 3 tank changes</location>
+  <notes>Shows three pressure plots, each from 200 to 100bar and gaschange events at 10, 20 and 25 min mark. Last change is back to first tank
+Now with samples. We have a sample at the first tank change but not the 2nd and 3rd</notes>
+  <cylinder o2='33.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='50.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <cylinder o2='75.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
+  <event time='10:00 min' name='gaschange' value='50' />
+  <event time='20:30 min' name='gaschange' value='75' />
+  <event time='25:59 min' name='gaschange' value='33' />
+  <sample time='1:00 min' temp='27.0 C' depth='5 m' />
+  <sample time='2:00 min' temp='26.0 C' depth='10 m' />
+  <sample time='3:00 min' temp='25.0 C' depth='15 m' />
+  <sample time='4:00 min' temp='24.0 C' depth='20 m' />
+  <sample time='5:00 min' temp='24.0 C' depth='25 m' />
+  <sample time='6:00 min' temp='23.0 C' depth='30 m' />
+  <sample time='7:00 min' depth='30 m' />
+  <sample time='8:00 min' depth='30 m' />
+  <sample time='9:00 min' depth='30 m' />
+  <sample time='10:00 min' depth='30 m' />
+  <sample time='11:00 min' depth='30 m' />
+  <sample time='12:00 min' depth='30 m' />
+  <sample time='13:00 min' depth='30 m' />
+  <sample time='14:00 min' temp='26.0 C' depth='10 m' />
+  <sample time='15:00 min' depth='15 m' />
+  <sample time='16:00 min' depth='5 m' />
+  <sample time='17:00 min' depth='10 m' />
+  <sample time='18:00 min' depth='10 m' />
+  <sample time='19:00 min' depth='10 m' />
+  <sample time='20:00 min' depth='10 m' />
+  <sample time='21:00 min' depth='10 m' />
+  <sample time='22:00 min' depth='5 m' />
+  <sample time='23:00 min' depth='5 m' />
+  <sample time='24:00 min' depth='5 m' />
+  <sample time='25:00 min' depth='5 m' />
+  <sample time='26:00 min' depth='5 m' />
+  <sample time='27:00 min' depth='5 m' />
+  <sample time='28:00 min' temp='26.0 C' depth='5 m' />
+  <sample time='29:00 min' temp='26.5 C' depth='2.5 m' />
+  <sample time='30:00 min' temp='26.0 C' depth='0 m' />
+</dive>
+</dives>
diff --git a/dives/test7.xml b/dives/test7.xml
index b58e1cfe4..694ebeb5b 100644
--- a/dives/test7.xml
+++ b/dives/test7.xml
@@ -5,7 +5,7 @@
   <temperature air='27.0 C' water='26.0 C' />
   <location>7th test dive, two tanks, tank change</location>
   <notes>SAC should be 0.93 cuft/min or 26.2 l/min
-Currently broken profile as we don't create sample / plot info for gas change event.</notes>
+Shows two pressure plots, each from 200 to 100bar and gaschange event at 15 minu mark.</notes>
   <cylinder o2='33.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
   <cylinder o2='50.0%' size='9.987 l' workpressure='206.843 bar' description='AL72' start='200.0 bar' end='100.0 bar' />
   <event time='15:00 min' name='gaschange' value='50' />
diff --git a/dives/test8.xml b/dives/test8.xml
index 3c25ab447..97097348c 100644
--- a/dives/test8.xml
+++ b/dives/test8.xml
@@ -5,7 +5,7 @@
   <temperature air='27.0 C' water='26.0 C' />
   <location>8th test dive, with samples</location>
   <notes>SAC should be 0.93 cuft/min or 26.2 l/min
-Tank pressure plotted incorrectly (issues with first sample on each tank).
+Tank pressure plotted incorrectly (issues with first sample of first tank).
 Descent light green
 First Ascent red, second orange, third yellow, last green
 </notes>