diff --git a/mock/src/main/resources/mockXML/boatTest.xml b/mock/src/main/resources/mockXML/boatTest.xml
index e764bf39..84f911bc 100644
--- a/mock/src/main/resources/mockXML/boatTest.xml
+++ b/mock/src/main/resources/mockXML/boatTest.xml
@@ -1,6 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
 <BoatConfig>
     <Boats>
+
+        <!--Mark Boats-->
+        <Boat Type="Mark" BoatName="PRO" SourceID="101" >
+            <GPSposition X= "-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="PIN" SourceID="102" >
+            <GPSposition X= "-64.855242" Y="32.293771" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="Marker1" SourceID="103" >
+            <GPSposition X= "-64.843983" Y="32.293039" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="WGL" SourceID="104" >
+            <GPSposition X= "-64.850045" Y="32.28468" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="WGR" SourceID="105" >
+            <GPSposition X= "-64.847591" Y="32.280164" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="LGL" SourceID="106" >
+            <GPSposition X= "-64.835249" Y="32.309693" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="LGR" SourceID="107" >
+            <GPSposition X= "-64.831785" Y="32.308046" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FL" SourceID="108" >
+            <GPSposition X= "-64.839291" Y="32.317379" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FR" SourceID="109" >
+            <GPSposition X= "-64.83626" Y="32.317257" Z="0"/>
+        </Boat>
+
+        <!--Participants-->
         <Boat BoatName="Team ORACLE USA" HullNum="RG01" ShapeID="0" ShortName="USA" SourceID="121" StoweName="USA" Type="Yacht">
             <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
         </Boat>
diff --git a/mock/src/main/resources/mockXML/raceTest.xml b/mock/src/main/resources/mockXML/raceTest.xml
index b374a52c..2cdb66e9 100644
--- a/mock/src/main/resources/mockXML/raceTest.xml
+++ b/mock/src/main/resources/mockXML/raceTest.xml
@@ -17,32 +17,28 @@
         <Corner CompoundMarkID="2" SeqID="2"/>
         <Corner CompoundMarkID="3" SeqID="3"/>
         <Corner CompoundMarkID="4" SeqID="4"/>
-        <Corner CompoundMarkID="5" SeqID="5"/>
-        <Corner CompoundMarkID="6" SeqID="6"/>
+        <Corner CompoundMarkID="3" SeqID="5"/>
+        <Corner CompoundMarkID="5" SeqID="6"/>
     </CompoundMarkSequence>
     <Course>
         <CompoundMark CompoundMarkID="1" Name="Start Line">
-            <Mark TargetLat="32.296577" TargetLng="-64.854304"/>
-            <Mark TargetLat="32.293771" TargetLng="-64.855242"/>
+            <Mark SeqId="1" Name="PRO" TargetLat="32.296577" TargetLng="-64.854304" SourceID="101"/>
+            <Mark SeqId="2" Name="PIN" TargetLat="32.293771" TargetLng="-64.855242" SourceID="102"/>
         </CompoundMark>
-        <CompoundMark CompoundMarkID="2" Name="Mark">
-            <Mark TargetLat="32.293039" TargetLng="-64.843983"/>
+        <CompoundMark CompoundMarkID="2" Name="Marker 1">
+            <Mark Name="Marker1" TargetLat="32.293039" TargetLng="-64.843983" SourceID="103"/>
         </CompoundMark>
         <CompoundMark CompoundMarkID="3" Name="Windward Gate">
-            <Mark TargetLat="32.28468" TargetLng="-64.850045"/>
-            <Mark TargetLat="32.280164" TargetLng="-64.847591"/>
+            <Mark Name="WGL" SeqId="1" TargetLat="32.28468" TargetLng="" SourceID="104"/>
+            <Mark Name="WGR" SeqId="2" TargetLat="32.280164" TargetLng="-64.847591" SourceID="105"/>
         </CompoundMark>
         <CompoundMark CompoundMarkID="4" Name="Leeward Gate">
-            <Mark TargetLat="32.309693" TargetLng="-64.835249"/>
-            <Mark TargetLat="32.308046" TargetLng="-64.831785"/>
+            <Mark Name="LGL" SeqId="1" TargetLat="32.309693" TargetLng="-64.835249" SourceID="106"/>
+            <Mark Name="LGR" SeqId="2" TargetLat="32.308046" TargetLng="-64.831785" SourceID="107"/>
         </CompoundMark>
-        <CompoundMark CompoundMarkID="5" Name="Windward Gate">
-            <Mark TargetLat="32.28468" TargetLng="-64.850045"/>
-            <Mark TargetLat="32.280164" TargetLng="-64.847591"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="6" Name="Finish Line">
-            <Mark TargetLat="32.317379" TargetLng="-64.839291"/>
-            <Mark TargetLat="32.317257" TargetLng="-64.83626"/>
+        <CompoundMark CompoundMarkID="5" Name="Finish Line">
+            <Mark Name="FL" SeqId="1" TargetLat="32.317379" TargetLng="-64.839291" SourceID="108"/>
+            <Mark Name="FR" SeqId="2" TargetLat="32.317257" TargetLng="-64.83626" SourceID="109"/>
         </CompoundMark>
     </Course>
     <CourseLimit>