diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
index bf93a577fa7eaed1a6c0af6b7e80c2042bea7db6..8468f6ffbf2bc2056acb28d2d21d473d3870ca87 100644
--- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
+++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
@@ -228,8 +228,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_level.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_level.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_level.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_level.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_level.vmod");
 		}
 
 		[TestMethod]
@@ -238,8 +238,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_uphill_5);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_uphill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod");
 		}
 
 		[TestMethod]
@@ -248,8 +248,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_downhill_5);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod");
 		}
 
 		[TestMethod]
@@ -487,8 +487,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_level.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_10_level.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_level.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_10_level.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_level.vmod");
 		}
 
 		[TestMethod]
@@ -497,12 +497,12 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
 				// <s>,<v>,<grad>,<stop>
 				"   0,  10, 5,    0",
-				"1000,  10, 5,    0",
+				"800,  10, 5,    0",
 			});
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_uphill_5.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_10_uphill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_uphill_5.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_10_uphill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_uphill_5.vmod");
 		}
 
 		[TestMethod]
@@ -511,8 +511,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_10_downhill_5.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_10_downhill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_downhill_5.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_10_downhill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_10_downhill_5.vmod");
 		}
 
 		[TestMethod]
@@ -565,8 +565,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -575,8 +575,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -585,8 +585,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -595,8 +595,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -605,8 +605,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -615,8 +615,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -625,8 +625,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec-inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_80_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_80_slope_dec-inc.vmod");
 		}
 
 		[TestMethod]
@@ -635,8 +635,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec-inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_50_slope_dec-inc.vmod");
 		}
 
 
@@ -646,8 +646,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope);
 			CoachPowerTrain.CreateEngineeringRun(cycle, "Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec-inc.vmod");
+			GraphWriter.Write("Coach_DriverStrategy_Drive_30_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\Coach\24t Coach_Cycle_Drive_30_slope_dec-inc.vmod");
 		}
 
 		#endregion
diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
index 348bd3fed0bf6cbfb05650717357cd42d644d37a..cdcc0455b8467843a50321bcb0713c7f22c90574 100644
--- a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
+++ b/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
@@ -228,8 +228,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_level);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_level.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_level.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_level.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod");
 		}
 
 		[TestMethod]
@@ -248,8 +248,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDecelerate_45_0_downhill_5);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Decelerate_45_0_downhill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod");
 		}
 
 		[TestMethod]
@@ -487,8 +487,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_level);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_level.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_10_level.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_10_level.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod");
 		}
 
 		[TestMethod]
@@ -497,12 +497,12 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(new[] {
 				// <s>,<v>,<grad>,<stop>
 				"   0,  10, 5,    0",
-				"1000,  10, 5,    0",
+				"500,  10, 5,    0",
 			});
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_uphill_5.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_10_uphill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_10_uphill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod");
 		}
 
 		[TestMethod]
@@ -511,8 +511,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_10_uphill_5);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_10_downhill_5.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_10_downhill_5.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_10_downhill_5.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod");
 		}
 
 		[TestMethod]
@@ -565,8 +565,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -575,8 +575,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -585,8 +585,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_inc.vmod");
 		}
 
 		[TestMethod]
@@ -595,8 +595,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -605,8 +605,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -615,8 +615,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_dec.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec.vmod");
 		}
 
 		[TestMethod]
@@ -625,8 +625,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec-inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_80_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_80_slope_dec-inc.vmod");
 		}
 
 		[TestMethod]
@@ -635,8 +635,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec-inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_50_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_50_slope_dec-inc.vmod");
 		}
 
 
@@ -646,8 +646,8 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
 			var cycle = SimpleDrivingCycles.CreateCycleData(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope);
 			Truck40tPowerTrain.CreateEngineeringRun(cycle, "Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod").Run();
 
-			//GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod",
-			//	@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec-inc.vmod");
+			GraphWriter.Write("Truck_DriverStrategy_Drive_30_slope_dec-inc.vmod",
+				@"..\..\TestData\Integration\DriverStrategy\Vecto2.2\40t Truck\40t_Long_Haul_Truck_Cycle_Drive_30_slope_dec-inc.vmod");
 		}
 
 		#endregion
diff --git a/VectoCoreTest/Integration/SimpleDrivingCycles.cs b/VectoCoreTest/Integration/SimpleDrivingCycles.cs
index 4625b894f8df3867d995233fcd38727324ffbafd..f8e3215f65d5fba536cf8789a97c552b9f0540a9 100644
--- a/VectoCoreTest/Integration/SimpleDrivingCycles.cs
+++ b/VectoCoreTest/Integration/SimpleDrivingCycles.cs
@@ -303,13 +303,13 @@ namespace TUGraz.VectoCore.Tests.Integration
 		public static readonly string[] CycleDrive_10_level = {
 			// <s>,<v>,<grad>,<stop>
 			"   0,  10, 0,    0",
-			"1000,  10, 0,    0",
+			"500,  10, 0,    0",
 		};
 
 		public static readonly string[] CycleDrive_10_uphill_5 = {
 			// <s>,<v>,<grad>,<stop>
 			"   0,  10, -5,    0",
-			" 1000, 10,  -5,   0",
+			" 800, 10,  -5,   0",
 		};
 
 		public static readonly string[] CycleDrive_10_downhill_25 = {
@@ -321,7 +321,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		public static readonly string[] CycleDrive_10_uphill_25 = {
 			// <s>,<v>,<grad>,<stop>
 			"   0, 10, 25,    0",
-			" 500, 10, 25,    0",
+			" 800, 10, 25,    0",
 		};
 
 		public static readonly string[] CycleDrive_10_downhill_15 = {
diff --git a/VectoCoreTest/Utils/GraphWriter.cs b/VectoCoreTest/Utils/GraphWriter.cs
index 78a3c3112e70afb6a38df834dd65c4b40a29f36a..7e049efa7d1c768b2c8e16b80cf2b07811efa4eb 100644
--- a/VectoCoreTest/Utils/GraphWriter.cs
+++ b/VectoCoreTest/Utils/GraphWriter.cs
@@ -7,6 +7,8 @@ using System.Drawing;
 using System.Drawing.Text;
 using System.Linq;
 using System.Net;
+using System.Text.RegularExpressions;
+using NLog;
 using TUGraz.VectoCore.Models.Simulation.Data;
 using TUGraz.VectoCore.Utils;
 
@@ -14,9 +16,60 @@ namespace TUGraz.VectoCore.Tests.Utils
 {
 	public static class GraphWriter
 	{
+		public static void Write(string fileName)
+		{
+			var modDataV3 = VectoCSVFile.Read(fileName);
+
+			var xfields = new[] { ModalResultField.time, ModalResultField.dist };
+
+			var yfields = new[] {
+				ModalResultField.v_act, ModalResultField.n, ModalResultField.Gear, ModalResultField.Pe_eng, ModalResultField.Tq_eng,
+				ModalResultField.FCMap
+			};
+
+			var images = new List<Stream>();
+			try {
+				foreach (var xfield in xfields) {
+					var x = modDataV3.Rows.Cast<DataRow>().Select(v => v.Field<string>(xfield.GetName())).ToArray();
+
+					for (var i = 1; i <= yfields.Length; i++) {
+						var yfield = yfields[i - 1];
+						var y = modDataV3.Rows.Cast<DataRow>().Select(v => v.Field<string>(yfield.GetName())).ToArray();
+
+						var values = string.Format("{0}|{1}", string.Join(",", x), string.Join(",", y));
+
+						if (yfield == ModalResultField.v_act) {
+							var y3 =
+								modDataV3.Rows.Cast<DataRow>()
+									.Select(v => v.Field<string>(ModalResultField.v_targ.GetName()))
+									.Select(v => string.IsNullOrWhiteSpace(v) ? "0" : v);
+
+							values += string.Format("|{0}|{1}", string.Join(",", x), string.Join(",", y3));
+						}
+
+						values = values.Replace("NaN", "0");
+						values = Regex.Replace(values, @"\..*?,", ","); // remove all decimal places to reduce request size
+						var maxX = (int)Math.Ceiling(x.ToDouble().Max());
+						images.Add(CreateGraphStream(xfield.GetCaption(), yfield.GetCaption(), maxX, values));
+					}
+					var outfileName = string.Format("{0}_{1}.png", Path.GetFileNameWithoutExtension(fileName), xfield.GetName());
+					SaveImages(outfileName, images.ToArray());
+					images.Clear();
+				}
+			} finally {
+				images.ForEach(x => x.Close());
+			}
+		}
+
+
 		public static void Write(string fileNameV3, string fileNameV22)
 		{
 			var modDataV3 = VectoCSVFile.Read(fileNameV3);
+			if (!File.Exists(fileNameV22)) {
+				LogManager.GetCurrentClassLogger().Error("Modfile V2.2 not found: " + fileNameV22);
+				Write(fileNameV3);
+				return;
+			}
 			var modDataV22 = VectoCSVFile.Read(fileNameV22);
 
 			var xfields = new[] { ModalResultField.time, ModalResultField.dist };
@@ -50,6 +103,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 						}
 
 						values = values.Replace("NaN", "0");
+						values = Regex.Replace(values, @"\..*?,", ","); // remove all decimal places to reduce request size
 						var maxX = (int)Math.Ceiling(Math.Max(x.ToDouble().Max(), x2.ToDouble().Max()));
 						images.Add(CreateGraphStream(xfield.GetCaption(), yfield.GetCaption(), maxX, values));
 					}