diff --git a/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.mtb b/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.mtb
new file mode 100755
index 00000000000..1666365eb51
Binary files /dev/null and b/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.mtb differ
diff --git a/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.txt b/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.txt
new file mode 100755
index 00000000000..5f5d2896e7d
--- /dev/null
+++ b/java/com.sap.sailing.domain.test/resources/event_20110929_Internatio-Champions_Cup_Final.txt
@@ -0,0 +1,321 @@
+stored-uri:datafiles/event_20110929_Internatio-Champions_Cup_Final.mtb
+StartReplay:1
+
+// Input from params_static:
+
+// Input from event_parameters:
+
+CompMarkerUUID:1
+PopUpRow1Name:
+PopUpRow1Type:Name
+PopUpRow2Name:Sail
+PopUpRow2Type:Ini
+PopUpRow3Name:Knots
+PopUpRow3Type:BoatSpeed
+PopUpRow4Name:After
+PopUpRow4Type:BoatAfter
+PopUpRow5Name:Rank in race
+PopUpRow5Type:RowNumber
+CodanIsSponsor:0
+DefaultTailLength:60
+APzoomChangeTime:2500
+disableAutoProduce:0
+autoProduce:1
+APstartLineShowOfLeg:0.25
+APsideOfStartLine:0.30
+APstartSwitch:0.8
+APwholeLegBehindMarks:0.15
+APmarkSwitch:0.13
+APmarkZoomBehindMarks:0.10
+APmarkZoomInFrontOfMarks:0.20
+PopupMarkerUUID:2
+ManualUrl:http://www.tractrac.com/files/userguide_sailing.pdf
+Marker1UUID:1
+Marker1Type:RGBMarkerFactory
+Marker1Directional:1
+Marker1Image:markers/boat_FF0000_big.png
+Marker1MetersPerPixel:0.0617
+Marker1MinScale:0.396
+Startlocation:10.905335928076264,53.97313845709198
+MaxDiffTime:1200
+MaxMetersPerSecond:20
+PrecisionMeters:20
+ShortAvgTime:180
+LongAvgTime:900
+TimeZone:0
+CompMarkerTimeout:60
+FramesPerSecond:8
+replayspeedup:5
+MatchRaceClock:0
+MatchRaceClockNo:3
+MatchRaceClockSpacing:300
+Minimap:1
+MinimapUseLayers:1
+Minimapgeorect:10.729523,54.106918,11.096191,53.94073
+MinimapMarkerUUID:2
+Marker4UUID:2
+Marker4Type:RGBmarkerFactory
+Marker4Directional:1
+Marker4Image:markers/boat_FF0000_small.png
+MetersPerPixel:10
+MetersPerPixelMax:30
+MetersPerPixelMin:0.05
+isMatchRace:0
+weatherEnabled:0
+showRaceClock:1
+BackGroundImage:graphics/background.jpg
+DisableRotation:0
+ControlPointMarkerRadius:13
+disableselection:0
+disableleaderline:0
+DisableChangeRace:0
+ResultColumn1Name:#
+ResultColumn1Size:20
+ResultColumn1Type:RowNumber
+ResultColumn2Size:20
+ResultColumn2Type:ColorMarker
+ResultColumn3Name:sail
+ResultColumn3Size:45
+ResultColumn3Type:Ini
+ResultColumn4Name:name
+ResultColumn4Size:110
+ResultColumn4Type:Name
+ResultColumn5Name:after
+ResultColumn5Size:45
+ResultColumn5Type:BoatAfter
+ResultColumn6Name:kts
+ResultColumn6Size:40
+ResultColumn6Type:BoatSpeed
+DisableLeaderboard:0
+DisableAnalysis:0
+TableFontSize:11
+//live-uri:tcp://germanmaster.traclive.dk:4400
+//stored-uri:tcp://germanmaster.traclive.dk:4401
+compInitialsFontSize:11
+AutoRotate:1
+MassStart:0
+SegmentFile:segments.php
+StartType:Mass
+ReCalcDirAndSpeed:0
+RaceHandicapSystem:NONE
+TeamCompetitionType:NONE
+LiveDelaySecs: 20
+
+//-------- AUTO GENERATED PARAMETERS START ----------------
+
+EventID:47a4bfbc-e917-11e0-a523-406186cbf87c
+EventName:Internationale Deutche Meisterschaft
+EventDB:event_20110929_Internatio
+EventStartTime:2011-09-29 01:00:00
+EventEndTime:2011-10-03 22:00:00
+
+RaceID:92073072-ed26-11e0-a523-406186cbf87c
+RaceName:Champions Cup Final
+RaceStartTime:2011-10-03 13:41:00
+RaceEndTime:
+RaceTrackingStartTime:2011-10-03 13:30:54
+RaceTrackingEndTime:2011-10-03 13:56:31
+RaceDefaultRouteUUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+RaceHandicapSystem:NONE
+
+Image1UUID:0c021234-ec4b-11e0-a523-406186cbf87c
+Image1Type:Logo
+Image1Description:IDM
+Image1Image:pictures/0c021234-ec4b-11e0-a523-406186cbf87c/original_IDM2011.png
+
+Image2UUID:47fbde6c-ed38-11e0-a523-406186cbf87c
+Image2Type:Logo
+Image2Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/NZL.gif
+Image2Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/NZL.gif
+
+Image3UUID:691170a0-eda9-11e0-a523-406186cbf87c
+Image3Type:Logo
+Image3Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/DEN.gif
+Image3Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/DEN.gif
+
+Image4UUID:85e73068-ec44-11e0-a523-406186cbf87c
+Image4Type:Logo
+Image4Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/GER.gif
+Image4Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/GER.gif
+
+Image5UUID:88ed4a78-ec4d-11e0-a523-406186cbf87c
+Image5Type:Logo
+Image5Description:SAP
+Image5Image:pictures/88ed4a78-ec4d-11e0-a523-406186cbf87c/sap-logo.png
+
+Image6UUID:a8654c02-ed38-11e0-a523-406186cbf87c
+Image6Type:Logo
+Image6Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/CZE.gif
+Image6Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/CZE.gif
+
+Image7UUID:a9ed5682-ed38-11e0-a523-406186cbf87c
+Image7Type:Logo
+Image7Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/NED.gif
+Image7Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/NED.gif
+
+Image8UUID:ac909e48-ec44-11e0-a523-406186cbf87c
+Image8Type:Logo
+Image8Description:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/SUI.gif
+Image8Image:http://germanmaster.traclive.dk/events/event_20100806_SailforGol/images/SUI.gif
+
+Image9UUID:f5087f78-ec4a-11e0-a523-406186cbf87c
+Image9Type:Logo
+Image9Description:Nordd
+Image9Image:pictures/f5087f78-ec4a-11e0-a523-406186cbf87c/Norddeutche.png
+
+Class1UUID:daf83cca-ed37-11e0-a523-406186cbf87c
+Class1Name:Champions
+
+Team1UUID:a8504744-ed38-11e0-a523-406186cbf87c
+Team1Name:CZE
+
+Team2UUID:68fb3eca-eda9-11e0-a523-406186cbf87c
+Team2Name:DEN
+
+Team3UUID:85e4b25c-ec44-11e0-a523-406186cbf87c
+Team3Name:GER
+Team3Comp1UUID:87aa2e1c-edb3-11e0-a523-406186cbf87c
+Team3Comp2UUID:a2d00aae-edb8-11e0-a523-406186cbf87c
+Team3Comp3UUID:eec6f52c-edb2-11e0-a523-406186cbf87c
+Team3Comp4UUID:bf5a99dc-edb8-11e0-a523-406186cbf87c
+
+Team4UUID:a9d71408-ed38-11e0-a523-406186cbf87c
+Team4Name:NED
+
+Team5UUID:47e6b3f2-ed38-11e0-a523-406186cbf87c
+Team5Name:NZL
+
+Team6UUID:ac7a7014-ec44-11e0-a523-406186cbf87c
+Team6Name:SUI
+
+Team7UUID:5058b7a0-ec3a-11e0-a523-406186cbf87c
+Team7Name:Test
+
+Comp1UUID:eec6f52c-edb2-11e0-a523-406186cbf87c
+Comp1Name:Kamrath+Buhl+Lewin
+Comp1NameShort:Blau
+Comp1Color:000080
+Comp1Nationality:GER
+Comp1Description:
+Comp1Handicap:1.0000000000
+Comp1HandicapDistance:0.00000
+Comp1StartTime:2011-10-03 13:41:00
+Comp1PictureUUID:85e73068-ec44-11e0-a523-406186cbf87c
+Comp1ClassUUID:daf83cca-ed37-11e0-a523-406186cbf87c
+Comp1RouteUUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+
+Comp2UUID:87aa2e1c-edb3-11e0-a523-406186cbf87c
+Comp2Name:Heil+Plössel+Baumann
+Comp2NameShort:Grün
+Comp2Color:008000
+Comp2Nationality:GER
+Comp2Description:
+Comp2Handicap:1.0000000000
+Comp2HandicapDistance:0.00000
+Comp2StartTime:2011-10-03 13:41:00
+Comp2PictureUUID:85e73068-ec44-11e0-a523-406186cbf87c
+Comp2ClassUUID:daf83cca-ed37-11e0-a523-406186cbf87c
+Comp2RouteUUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+
+Comp3UUID:a2d00aae-edb8-11e0-a523-406186cbf87c
+Comp3Name:Kadelbach+Belcher+Stanczyk
+Comp3NameShort:Gelb
+Comp3Color:FFFF00
+Comp3Nationality:GER
+Comp3Description:
+Comp3Handicap:1.0000000000
+Comp3HandicapDistance:0.00000
+Comp3StartTime:2011-10-03 13:41:00
+Comp3PictureUUID:85e73068-ec44-11e0-a523-406186cbf87c
+Comp3ClassUUID:daf83cca-ed37-11e0-a523-406186cbf87c
+Comp3RouteUUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+
+Comp4UUID:bf5a99dc-edb8-11e0-a523-406186cbf87c
+Comp4Name:Polgar+Koy+Seelig
+Comp4NameShort:Rot
+Comp4Color:FF0000
+Comp4Nationality:GER
+Comp4Description:
+Comp4Handicap:1.0000000000
+Comp4HandicapDistance:0.00000
+Comp4StartTime:2011-10-03 13:41:00
+Comp4PictureUUID:85e73068-ec44-11e0-a523-406186cbf87c
+Comp4ClassUUID:daf83cca-ed37-11e0-a523-406186cbf87c
+Comp4RouteUUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+
+ControlPoint1UUID:03b75c68-ec43-11e0-a523-406186cbf87c
+ControlPoint1Name:G1 Start-Finish
+ControlPoint1HasTwoPoints:1
+ControlPoint1ShortName:SF
+ControlPoint1Mark1Lon:10.894043
+ControlPoint1Mark1Lat:53.967922
+ControlPoint1Mark2Lon:10.878700
+ControlPoint1Mark2Lat:53.959983
+
+ControlPoint2UUID:0dc52248-ec3a-11e0-a523-406186cbf87c
+ControlPoint2Name:Test2
+ControlPoint2HasTwoPoints:0
+ControlPoint2ShortName:T2
+ControlPoint2Mark1Lon:10.898781
+ControlPoint2Mark1Lat:53.967296
+
+ControlPoint3UUID:21d1d520-ec43-11e0-a523-406186cbf87c
+ControlPoint3Name:G1 Mark 1
+ControlPoint3HasTwoPoints:0
+ControlPoint3ShortName:1
+ControlPoint3Mark1Lon:10.878867
+ControlPoint3Mark1Lat:53.959983
+
+ControlPoint4UUID:2dec7b44-ec43-11e0-a523-406186cbf87c
+ControlPoint4Name:G1 Mark 4
+ControlPoint4HasTwoPoints:1
+ControlPoint4ShortName:4
+ControlPoint4Mark1Lon:10.878912
+ControlPoint4Mark1Lat:53.960288
+ControlPoint4Mark2Lon:10.878687
+ControlPoint4Mark2Lat:53.959980
+
+ControlPoint5UUID:3d734be2-ed24-11e0-a523-406186cbf87c
+ControlPoint5Name:G2 Start-Finish
+ControlPoint5HasTwoPoints:1
+ControlPoint5ShortName:SF
+ControlPoint5Mark1Lon:10.894012
+ControlPoint5Mark1Lat:53.967983
+ControlPoint5Mark2Lon:10.894412
+ControlPoint5Mark2Lat:53.967442
+
+ControlPoint6UUID:4b8bda0a-ed24-11e0-a523-406186cbf87c
+ControlPoint6Name:G2 Mark1
+ControlPoint6HasTwoPoints:0
+ControlPoint6ShortName:1
+ControlPoint6Mark1Lon:10.888957
+ControlPoint6Mark1Lat:53.965057
+
+ControlPoint7UUID:5f3bf4f4-ed24-11e0-a523-406186cbf87c
+ControlPoint7Name:G2 Mark4
+ControlPoint7HasTwoPoints:1
+ControlPoint7ShortName:4
+ControlPoint7Mark1Lon:10.893390
+ControlPoint7Mark1Lat:53.967182
+ControlPoint7Mark2Lon:10.893758
+ControlPoint7Mark2Lat:53.966885
+
+ControlPoint8UUID:e3505cc6-ec39-11e0-a523-406186cbf87c
+ControlPoint8Name:Test1
+ControlPoint8HasTwoPoints:0
+ControlPoint8ShortName:T1
+ControlPoint8Mark1Lon:10.896206
+ControlPoint8Mark1Lat:53.972243
+
+
+SegmentFile:segments.php
+Route1UUID:4af1f26c-ed26-11e0-a523-406186cbf87c
+Route1Description:CC Final
+Route1Length:0
+Route1ControlPoint1UUID:3d734be2-ed24-11e0-a523-406186cbf87c
+Route1ControlPoint2UUID:4b8bda0a-ed24-11e0-a523-406186cbf87c
+Route1ControlPoint3UUID:5f3bf4f4-ed24-11e0-a523-406186cbf87c
+Route1ControlPoint4UUID:4b8bda0a-ed24-11e0-a523-406186cbf87c
+Route1ControlPoint5UUID:3d734be2-ed24-11e0-a523-406186cbf87c
+
+//-------- AUTO GENERATED PARAMETERS END ------------------
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java
index 358c8d47a8a..eb06677fe03 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java
@@ -5,7 +5,9 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -46,9 +48,11 @@ public class ManeuverAnalysisIDMChampionsFinalTest extends AbstractManeuverDetec
     @Before
     public void setUp() throws URISyntaxException, IOException, InterruptedException {
         super.setUp();
-        super.setUp("event_20110929_Internatio",
-        /* raceId */"92073072-ed26-11e0-a523-406186cbf87c", new ReceiverType[] { ReceiverType.MARKPASSINGS,
-                ReceiverType.RACECOURSE, ReceiverType.RAWPOSITIONS });
+        URL mtbUrl = getClass().getClassLoader().getResource("event_20110929_Internatio-Champions_Cup_Final.mtb");
+        URI storedUri = new URI(mtbUrl.toString());
+        super.setUp(getClass().getClassLoader().getResource("event_20110929_Internatio-Champions_Cup_Final.txt"),
+                /* liveUri */ null, /* storedUri */ storedUri,
+                new ReceiverType[] { ReceiverType.MARKPASSINGS, ReceiverType.RACECOURSE, ReceiverType.RAWPOSITIONS });
         fixApproximateMarkPositionsForWindReadOut(getTrackedRace());
         getTrackedRace().recordWind(
                 new WindImpl(/* position */null, MillisecondsTimePoint.now(), new KnotSpeedWithBearingImpl(12,