From 02fcc52125411e1a8237b3130edf303af33c09c4 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 12 Apr 2022 15:38:31 +0200
Subject: [PATCH] Added E3 and S3 Tests for Retarder

---
 .../BatteryElectric/BatteryElectricTest.cs    |  124 +-
 .../Integration/Hybrid/SerialHybridTest.cs    |   89 +-
 .../E3/E3WithAxlegearInputRetarder.vecto      |    2 +-
 .../E3/E3WithAxlegearInputRetarder.vveh       |   11 +-
 ...hAxlegearInputRetarder_LongHaul_short.vmod |   20 +-
 ...tAxlegearInputRetarder_LongHaul_short.vmod |    2 +-
 .../Components/Retarder/P3/325kW.vfld         |  202 --
 .../Components/Retarder/P3/325kW.vmap         |  140 --
 .../Components/Retarder/P3/AMT_12.vgbx        |  117 -
 .../Components/Retarder/P3/Default.vrlm       |   32 -
 .../Components/Retarder/P3/Gear_1.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_10.vtlm       |  233 --
 .../Components/Retarder/P3/Gear_11.vtlm       |  233 --
 .../Components/Retarder/P3/Gear_12.vtlm       |  233 --
 .../Components/Retarder/P3/Gear_2.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_3.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_4.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_5.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_6.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_7.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_8.vtlm        |  233 --
 .../Components/Retarder/P3/Gear_9.vtlm        |  233 --
 .../P3/GenericBattery_10kWh_658V.vbat         |   18 -
 .../P3/GenericBattery_10kWh_658V.vbatr        |    3 -
 .../P3/GenericBattery_10kWh_658V.vbatv        |   12 -
 .../Retarder/P3/GenericDrag_140kW_936Nm.vemd  |    3 -
 .../P3/GenericEMotor_140kW_900Nm.vemp         |   74 -
 .../Retarder/P3/GenericEMotor_140kW_936Nm.vem |   20 -
 .../Retarder/P3/GenericMap_140kW_936Nm.vemo   | 2016 -----------------
 .../Retarder/P3/Hybrid_Parameters.vhctl       |   17 -
 .../Retarder/P3/MaxCurrent_2240.vimax         |    4 -
 .../Retarder/P3/MaxCurrent_280.vimax          |    4 -
 .../TestData/Components/Retarder/P3/P3.vecto  |   53 -
 .../TestData/Components/Retarder/P3/P3.vveh   |  112 -
 .../209kW_7c7l.veng}                          |   20 +-
 .../Components/Retarder/S3/209kW_ICE_Map.vmap |  163 ++
 .../Components/Retarder/S3/209kW_ICE_fld.vfld |    7 +
 .../TestData/Components/Retarder/S3/Axle.vgbx |   33 +
 .../Retarder/{P3 => S3}/Axle_4x2_Tractor.vtlm |    0
 .../Components/Retarder/S3/EM_Map.vemo        |  925 ++++++++
 .../Components/Retarder/S3/EM_drag.vemd       |   24 +
 .../Components/Retarder/S3/EM_fld.vemp        |   25 +
 .../Components/Retarder/S3/Gen_Map.vemo       |  379 ++++
 .../Components/Retarder/S3/Gen_drag.vemd      |   11 +
 .../Components/Retarder/S3/Gen_fld.vemp       |   13 +
 .../Retarder/S3/GenericBattery.vbatr          |    3 +
 .../Retarder/S3/GenericBattery.vreess         |   19 +
 .../Components/Retarder/S3/GenericEM.vem      |   33 +
 .../Components/Retarder/S3/GenericGen.vem     |   33 +
 .../Retarder/S3/Hybrid_Parameters.vhctl       |   18 +
 .../Retarder/S3/LongHaul_short.vdri           |   12 +
 .../Components/Retarder/S3/MaxCurrent.vimax   |    3 +
 .../Retarder/S3/REESS_SOC_curve.vbatv         |   13 +
 .../Components/Retarder/S3/Retarder.vrlm      |   25 +
 .../S3/S3WithAxlegearInputRetarder.vecto      |   52 +
 .../S3/S3WithAxlegearInputRetarder.vveh       |   97 +
 .../S3/S3WithoutAxlegearInputRetarder.vecto   |   51 +
 .../S3/S3WithoutAxlegearInputRetarder.vveh    |   92 +
 .../Components/Retarder/{P3 => S3}/Truck.vacc |    2 +-
 59 files changed, 2256 insertions(+), 5668 deletions(-)
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vfld
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vmap
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/AMT_12.vgbx
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Default.vrlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_1.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_10.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_11.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_12.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_2.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_3.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_4.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_5.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_6.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_7.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_8.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_9.vtlm
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbat
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatr
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatv
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericDrag_140kW_936Nm.vemd
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_900Nm.vemp
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_936Nm.vem
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericMap_140kW_936Nm.vemo
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Hybrid_Parameters.vhctl
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_2240.vimax
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_280.vimax
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vecto
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vveh
 rename VectoCore/VectoCoreTest/TestData/Components/Retarder/{P3/Engine_325kW_12.7l.veng => S3/209kW_7c7l.veng} (57%)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_Map.vmap
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_fld.vfld
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle.vgbx
 rename VectoCore/VectoCoreTest/TestData/Components/Retarder/{P3 => S3}/Axle_4x2_Tractor.vtlm (100%)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_Map.vemo
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_drag.vemd
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_fld.vemp
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_Map.vemo
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_drag.vemd
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_fld.vemp
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vbatr
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vreess
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericEM.vem
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericGen.vem
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Hybrid_Parameters.vhctl
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/LongHaul_short.vdri
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/MaxCurrent.vimax
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/REESS_SOC_curve.vbatv
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Retarder.vrlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vecto
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vecto
 create mode 100644 VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
 rename VectoCore/VectoCoreTest/TestData/Components/Retarder/{P3 => S3}/Truck.vacc (62%)

diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 36f9422ed6..b08171c446 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -28,6 +28,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
 using TUGraz.VectoCore.Tests.Models.SimulationComponentData;
 using TUGraz.VectoCore.Tests.Utils;
 using TUGraz.VectoCore.Utils;
+using static System.Formats.Asn1.AsnWriter;
 using ElectricSystem = TUGraz.VectoCore.Models.SimulationComponent.ElectricSystem;
 
 
@@ -725,6 +726,110 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 
 
 
+		[TestCase]
+		public void Run_E3_AxlegearInputRetarder()
+		{
+			var cycle = SimpleDrivingCycles.CreateCycleData("0, 80, 0, 0\n500, 80, 0, 0");
+			var job = CreateEngineeringRun(cycle, $"{MethodBase.GetCurrentMethod()}.vmod", 0.5,
+				PowertrainPosition.BatteryElectricE3, 2, 2,largeMotor: true, retarderType: RetarderType.AxlegearInputRetarder);
+			var run = job.Runs.First().Run;
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			run.Run();
+
+			Assert.IsTrue(run.FinishedWithoutErrors);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()).Value()), Is.GreaterThan(0));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()).Value()), Is.GreaterThan(0));
+		}
+
+		[TestCase]
+		public void Run_E3_WithoutAxlegearInputRetarder()
+		{
+			var cycleData = string.Format(
+				@"   0, {0}, {1},    0
+				  7000, {0}, {1},    0", 80, 0);
+			var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+
+			var modFilename = $"SimpleBatteryElectric-B3_constant";
+			const PowertrainPosition pos = PowertrainPosition.BatteryElectricE3;
+			var job = CreateEngineeringRun(
+				cycle, modFilename, 0.5, pos, 2, 22.6, largeMotor: true, pAuxEl: 0);
+			var run = job.Runs.First().Run;
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			var data = run.GetContainer().RunData;
+			//File.WriteAllText(
+			//	$"{modFilename}.json",
+			//	JsonConvert.SerializeObject(data, Formatting.Indented));
+
+			run.Run();
+			Assert.IsTrue(run.FinishedWithoutErrors);
+
+			Assert.IsTrue(modData.Rows.Count > 0);
+
+
+
+			//var cycle = SimpleDrivingCycles.CreateCycleData("0, 80, 0, 0\n7000, 80, 0, 0");
+			//var job = CreateEngineeringRun(cycle, $"{MethodBase.GetCurrentMethod()}.vmod", 0.5,
+			//	PowertrainPosition.BatteryElectricE3, 2, 2, largeMotor: true, retarderType: RetarderType.None, pAuxEl:0);
+			//var run = job.Runs.First().Run;
+			//var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			//run.Run();
+
+			//Assert.IsTrue(run.FinishedWithoutErrors);
+			//Assert.IsTrue(modData.Rows.Count > 0);
+			//Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			//Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			//Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()) is null));
+			//Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()) is null));
+		}
+
+		[TestCase]
+		public void RunJob_E3_AxlegearInputRetarder() {
+			var jobFile = @"TestData\Components\Retarder\E3\E3WithAxlegearInputRetarder.vecto";
+			var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+			var writer = new FileOutputWriter(jobFile);
+			var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
+			factory.Validate = false;
+			factory.WriteModalResults = true;
+			factory.SumData = new SummaryDataContainer(writer);
+			var run = factory.SimulationRuns().ToArray()[0];
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			run.Run();
+			Assert.IsTrue(run.FinishedWithoutErrors);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()).Value()), Is.GreaterThan(0));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()).Value()), Is.GreaterThan(0));
+		}
+
+		[TestCase]
+		public void RunJob_E3_NoAxlegearInputRetarder()
+		{
+			var jobFile = @"TestData\Components\Retarder\E3\E3WithoutAxlegearInputRetarder.vecto";
+			var inputProvider = JSONInputDataFactory.ReadJsonJob(jobFile);
+			var writer = new FileOutputWriter(jobFile);
+			var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Engineering, inputProvider, writer);
+			factory.Validate = false;
+			factory.WriteModalResults = true;
+			factory.SumData = new SummaryDataContainer(writer);
+			var run = factory.SimulationRuns().First();
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			run.Run();
+			Assert.IsTrue(run.FinishedWithoutErrors);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()) is null));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()) is null));
+		}
 
 		// =================================================
 
@@ -841,16 +946,16 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 				case PowertrainPosition.HybridP4:
 					throw new VectoException("testcase does not support parallel powertrain configurations");
 				case PowertrainPosition.BatteryElectricE4:
-					powertrain.AddComponent(
-						GetElectricMachine(PowertrainPosition.BatteryElectricE4, runData.ElectricMachinesData, container, es, ctl));
+					powertrain.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE4, runData.ElectricMachinesData, container, es, ctl));
 					new DummyGearboxInfo(container);
 					//new MockEngineInfo(container);
 					new ATClutchInfo(container);
 					break;
 				case PowertrainPosition.BatteryElectricE3:
-					powertrain.AddComponent(new AxleGear(container, runData.AxleGearData))
-							.AddComponent(
-								GetElectricMachine(PowertrainPosition.BatteryElectricE3, runData.ElectricMachinesData, container, es, ctl));
+					powertrain
+						.AddComponent(new AxleGear(container, runData.AxleGearData))
+						.AddComponent(runData.Retarder.Type == RetarderType.AxlegearInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE3, runData.ElectricMachinesData, container, es, ctl));
 					new DummyGearboxInfo(container);
 					//new MockEngineInfo(container);
 					new ATClutchInfo(container);
@@ -863,10 +968,13 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 							(int)entry.Key, null, new TransmissionInputData().Repeat(gearboxData.Gears.Count + 1).Cast<ITransmissionInputData>().ToList(), null, axleGearData.AxleGear.Ratio,
 							vehicleData.DynamicTyreRadius, electricMotorData.First().Item2);
 					}
-					powertrain.AddComponent(new AxleGear(container, runData.AxleGearData))
+
+					powertrain
+						.AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null)
+						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
 						.AddComponent(new PEVGearbox(container, strategy))
-						.AddComponent(
-							GetElectricMachine(PowertrainPosition.BatteryElectricE2, runData.ElectricMachinesData, container, es, ctl));
+						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2, runData.ElectricMachinesData, container, es, ctl));
 					new ATClutchInfo(container);
 					break;
 				//throw new VectoException("Battery Electric configuration B2 currently not supported");
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index f022cf5f07..88a7e03cb6 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
+using System.Data;
+using System.Reflection;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
@@ -515,6 +517,68 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 			Assert.IsTrue(run.FinishedWithoutErrors);
 			return modData;
 		}
+		
+		[TestCase]
+		public void Run_S3_AxlegearInputRetarder()
+		{
+			var cycle = SimpleDrivingCycles.CreateCycleData("0, 80, 0, 0\n100, 80, 0, 0");
+			var job = CreateEngineeringRun(cycle, $"{MethodBase.GetCurrentMethod()}.vmod", 0.5, 
+				PowertrainPosition.BatteryElectricE3, 12.47, retarderType:RetarderType.AxlegearInputRetarder);
+			var run = job.Runs.First().Run;
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			run.Run();
+
+			Assert.IsTrue(run.FinishedWithoutErrors);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Sum(r=>r.Field<Watt>(ModalResultField.P_ret_loss.GetName()).Value()), Is.GreaterThan(0));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()).Value()), Is.GreaterThan(0));
+		}
+
+		[TestCase]
+		public void Run_S3_WithoutAxlegearInputRetarder()
+		{
+			var cycle = SimpleDrivingCycles.CreateCycleData("0, 80, 0, 0\n100, 80, 0, 0");
+			var job = CreateEngineeringRun(cycle, $"{MethodBase.GetCurrentMethod()}.vmod", 0.5,
+				PowertrainPosition.BatteryElectricE3, 12.47, retarderType: RetarderType.None);
+			var run = job.Runs.First().Run;
+			var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+			run.Run();
+
+			Assert.IsTrue(run.FinishedWithoutErrors);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()) is null));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()) is null));
+		}
+
+		[TestCase]
+		public void RunJob_S3_AxlegearInputRetarder()
+		{
+			var modData = RunHybridJob(@"TestData\Components\Retarder\S3\S3WithAxlegearInputRetarder.vecto", 0);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()).Value()), Is.GreaterThan(0));
+			Assert.That(modData.Sum(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()).Value()), Is.GreaterThan(0));
+		}
+
+		[TestCase]
+		public void RunJob_S3_NoAxlegearInputRetarder()
+		{
+			var modData = RunHybridJob(@"TestData\Components\Retarder\S3\S3WithoutAxlegearInputRetarder.vecto", 0);
+			Assert.IsTrue(modData.Rows.Count > 0);
+			Assert.That(modData.Columns.Contains(ModalResultField.P_ret_loss.GetName()));
+			Assert.That(modData.Columns.Contains(ModalResultField.P_retarder_in.GetName()));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_ret_loss.GetName()) is null));
+			Assert.That(modData.Rows.Cast<DataRow>().All(r => r.Field<Watt>(ModalResultField.P_retarder_in.GetName()) is null));
+		}
+
+
 
 		// =================================================
 
@@ -563,7 +627,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 
 			foreach (var entry in gearboxData.Gears) {
 				entry.Value.ShiftPolygon = DeclarationData.Gearbox.ComputeEfficiencyShiftPolygon(
-					(int)entry.Key, engineData.FullLoadCurves[entry.Key], new TransmissionInputData().Repeat(gearboxData.Gears.Count + 1).Cast<ITransmissionInputData>().ToList(), engineData, axleGearData.AxleGear.Ratio,
+					(int)entry.Key, engineData.FullLoadCurves[entry.Key], new TransmissionInputData().Repeat(gearboxData.Gears.Count + 1)
+						.Cast<ITransmissionInputData>().ToList(), engineData, axleGearData.AxleGear.Ratio,
 					vehicleData.DynamicTyreRadius);
 			}
 
@@ -641,29 +706,31 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
 						: new Gearbox(container, ctl.ShiftStrategy);
 					powertrain = powertrain.AddComponent(new AxleGear(container, runData.AxleGearData))
 						.AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null)
-						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder 
+							? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
 						.AddComponent((IGearbox)gearbox)
-						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
-						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2, runData.ElectricMachinesData,
-							container, es, ctl));
+						.AddComponent(runData.Retarder.Type == RetarderType.TransmissionInputRetarder 
+							? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE2, 
+							runData.ElectricMachinesData, container, es, ctl));
 					ctl.Gearbox = gearbox;
 
 					break;
 					
 				case PowertrainPosition.BatteryElectricE3:
 					powertrain = powertrain.AddComponent(new AxleGear(container, runData.AxleGearData))
-						.AddComponent(runData.Retarder.Type == RetarderType.AxlegearInputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
-						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE3, runData.ElectricMachinesData,
-							container, es, ctl));
+						.AddComponent(runData.Retarder.Type == RetarderType.AxlegearInputRetarder 
+							? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null)
+						.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE3, 
+							runData.ElectricMachinesData, container, es, ctl));
 					new DummyGearboxInfo(container, new GearshiftPosition(0));
 					//new MockEngineInfo(container);
 					new ATClutchInfo(container);
 					runData.GearboxData = null;
 					break;
 				case PowertrainPosition.BatteryElectricE4:
-					powertrain = powertrain.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE4, runData.ElectricMachinesData,
-							container,
-							es, ctl));
+					powertrain = powertrain.AddComponent(GetElectricMachine(PowertrainPosition.BatteryElectricE4, 
+						runData.ElectricMachinesData, container, es, ctl));
 					new DummyGearboxInfo(container, new GearshiftPosition(0));
 					//new MockEngineInfo(container);
 					new ATClutchInfo(container);
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
index b3c4197afe..5b5966ed15 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2022-03-29T15:43:00.0002009Z",
+    "Date": "2022-04-12T12:56:47.3927785Z",
     "AppVersion": "3",
     "FileVersion": 9
   },
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
index 0eff0538d6..fe20437262 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vveh
@@ -1,7 +1,7 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2022-03-30T07:41:25.7869007Z",
+    "Date": "2022-04-12T12:56:45.6383313Z",
     "AppVersion": "3",
     "FileVersion": 10
   },
@@ -68,7 +68,7 @@
       {
         "Count": 2,
         "Ratio": 8.56,
-        "Position": "E4",
+        "Position": "E3",
         "MotorFile": "GenericEMotor_125kW_485Nm.vem",
         "MechanicalEfficiency": 0.97
       }
@@ -79,6 +79,11 @@
         "BatteryFile": "GenericBattery_243kWh_750V.vbat",
         "StreamId": 0
       }
-    ]
+    ],
+    "Retarder": {
+      "Type": "AxlegearInputRetarder",
+      "Ratio": 1.0,
+      "File": "Retarder.vrlm"
+    }
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder_LongHaul_short.vmod b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder_LongHaul_short.vmod
index b49824420a..49fc61d070 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder_LongHaul_short.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder_LongHaul_short.vmod
@@ -1,13 +1,13 @@
-# VECTO-DEV 0.7.7.2644-DEV - 29.03.2022 17:43
+# VECTO-DEV 0.7.7.2658-DEV - 12.04.2022 15:02
 time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_REESS_T [kW],P_REESS_int [kW],P_REESS_loss [kW],P_REESS_charge_max [kW],P_REESS_discharge_max [kW],REESS SOC [%],U_REESS_terminal [V],U_0_REESS [V],I_REESS [A],i_E3-em [-],P_E3_out [kW],P_E3_mech [kW],P_E3_in [kW],P_E3_transm_loss [kW],P_E3-em_mech [kW],P_E3-em_inertia_loss [kW],P_E3-em_mech_map [kW],P_E3-em_loss [kW],P_E3-em_el [kW],P_E3_loss [kW],n_E3-em_avg [1/min],T_E3-em [Nm],T_E3-em_map [Nm],T_E3-em_drive_max [Nm],T_E3-em_gen_max [Nm],P_E3-em_drive_max [kW],P_E3-em_gen_max [kW],EM_OVL-E3-em [%],EM_E3_off,P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_el [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],DriverAction,EcoRollConditionsMet,PCCSegment,PCCState,ICE On,U0_reess_0,U_reess_terminal_0,I_reess_0,REESSStateOfCharge_0,P_reess_terminal_0,P_reess_int_0,P_reess_loss_0,P_reess_charge_max_0,P_reess_discharge_max_0,U0_reess_1,U_reess_terminal_1,I_reess_1,REESSStateOfCharge_1,P_reess_terminal_1,P_reess_int_1,P_reess_loss_1,P_reess_charge_max_1,P_reess_discharge_max_1
 0.5000,1.0000,0.0000,0.0000,0.0000,0.0000,2.9502,0.0000,,,,,,,,,,,,-3.5400,-3.5405,0.0005,2598.1560,-2178.2520,79.9998,1474.0079,1474.2000,-2.4016,8.5600,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,,0.0000,0.0000,3.3333,1.0000,,,,3.5400,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,,,,0,0,0,0,,737.1000,737.0039,-2.4016,79.9998,-1.7700,-1.7702,0.0002,1299.0780,-1089.1260,737.1000,737.0039,-2.4016,79.9998,-1.7700,-1.7702,0.0002,1299.0780,-1089.1260
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,2.9502,0.0000,,,,,,,,,,,,-3.5400,-3.5405,0.0005,2598.1558,-2178.2518,79.9996,1474.0077,1474.1999,-2.4016,8.5600,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,,0.0000,0.0000,6.6667,1.0000,,,,3.5400,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,,,,0,0,0,0,,737.0999,737.0039,-2.4016,79.9996,-1.7700,-1.7702,0.0002,1299.0779,-1089.1259,737.0999,737.0039,-2.4016,79.9996,-1.7700,-1.7702,0.0002,1299.0779,-1089.1259
-2.3536,0.7071,0.2500,1.2728,60.0000,1.0000,2.9502,0.0074,,,,,,,,,,,,-11.0523,-11.0568,0.0045,2598.1556,-2178.2516,79.9991,1473.5997,1474.1997,-7.5002,8.5600,4.9313,-4.9313,0.0000,0.1525,-5.0838,0.1146,-5.1984,2.3139,-7.5123,2.5810,181.2266,-267.8780,-273.9168,-970.0000,970.0000,-18.4087,18.4087,9.0242,0.0000,,,,3.5400,,,,4.9313,0.0333,,,4.8980,0.1880,4.7100,0.0000,4.7100,0.1137,4.5963,0.9805,0.0005,0.2248,3.3906,,,,,,,,,,,6,0,0,0,,737.0999,736.7999,-7.5002,79.9991,-5.5262,-5.5284,0.0023,1299.0778,-1089.1258,737.0999,736.7999,-7.5002,79.9991,-5.5262,-5.5284,0.0023,1299.0778,-1089.1258
-2.9029,0.3916,0.6036,3.2504,60.0000,1.0000,2.9502,0.0178,,,,,,,,,,,,-19.7556,-19.7700,0.0144,2598.1551,-2178.2511,79.9987,1473.1266,1474.1994,-13.4107,8.5600,12.5938,-12.5938,0.0000,0.3895,-12.9833,0.5219,-13.5052,2.7104,-16.2156,3.6218,462.8118,-267.8877,-278.6557,-970.0000,970.0000,-47.0116,47.0116,10.3299,0.0000,,,,3.5400,,,,12.5938,0.0851,,,12.5088,0.4775,12.0312,0.0000,12.0312,0.2904,11.7409,2.5040,0.0041,0.5740,8.6588,,,,,,,,,,,6,0,0,0,,737.0997,736.5633,-13.4107,79.9987,-9.8778,-9.8850,0.0072,1299.0775,-1089.1255,737.0997,736.5633,-13.4107,79.9987,-9.8778,-9.8850,0.0072,1299.0775,-1089.1255
-3.3086,0.4198,1.1529,4.7109,60.0000,1.0000,2.9502,0.0340,,,,,,,,,,,,-26.1814,-26.2067,0.0253,2598.1546,-2178.2506,79.9980,1472.7770,1474.1991,-17.7769,8.5600,18.2563,-18.2563,0.0000,0.5646,-18.8209,0.7803,-19.6012,3.0401,-22.6414,4.3851,670.7620,-267.9440,-279.0529,-970.0000,970.0000,-68.1348,68.1348,11.7297,0.0000,,,,3.5400,,,,18.2563,0.1235,,,18.1328,0.6895,17.4433,0.0000,17.4433,0.4208,17.0225,3.6291,0.0121,0.8320,12.5493,,,,,,,,,,,6,0,0,0,,737.0996,736.3885,-17.7769,79.9980,-13.0907,-13.1033,0.0126,1299.0773,-1089.1253,737.0996,736.3885,-17.7769,79.9980,-13.0907,-13.1033,0.0126,1299.0773,-1089.1253
-3.7370,0.4371,1.9121,6.2533,60.0000,1.0000,2.9502,0.0564,,,,,,,,,,,,-33.0369,-33.0772,0.0403,2598.1539,-2178.2499,79.9972,1472.4037,1474.1987,-22.4374,8.5600,24.2425,-24.2425,0.0000,0.7498,-24.9923,1.0553,-26.0475,3.4494,-29.4969,5.2544,890.3773,-268.0422,-279.3599,-970.0000,970.0000,-90.4429,90.4429,13.1873,0.0000,,,,3.5400,,,,24.2425,0.1643,,,24.0782,0.9117,23.1665,0.0000,23.1665,0.5586,22.6079,4.8173,0.0281,1.1044,16.6581,,,,,,,,,,,6,0,0,0,,737.0994,736.2019,-22.4374,79.9972,-16.5185,-16.5386,0.0201,1299.0770,-1089.1250,737.0994,736.2019,-22.4374,79.9972,-16.5185,-16.5386,0.0201,1299.0770,-1089.1250
-4.1799,0.4486,2.8899,7.8475,60.0000,1.0000,2.9502,0.0853,,,,,,,,,,,,-40.2274,-40.2871,0.0597,2598.1530,-2178.2490,79.9962,1472.0119,1474.1982,-27.3282,8.5600,30.4388,-30.4388,0.0000,0.9414,-31.3802,1.3405,-32.7207,3.9667,-36.6874,6.2486,1117.3629,-268.1839,-279.6401,-970.0000,970.0000,-113.4997,113.4997,14.6833,0.0000,,,,3.5400,,,,30.4388,0.2066,,,30.2322,1.1398,29.0924,0.0000,29.0924,0.7010,28.3913,6.0454,0.0552,1.3859,20.9048,,,,,,,,,,,6,0,0,0,,737.0991,736.0060,-27.3282,79.9962,-20.1137,-20.1436,0.0299,1299.0765,-1089.1245,737.0991,736.0060,-27.3282,79.9962,-20.1137,-20.1436,0.0299,1299.0765,-1089.1245
-4.6324,0.4566,4.0920,9.4768,60.0000,1.0000,2.9502,0.1207,,,,,,,,,,,,-47.4627,-47.5459,0.0832,2598.1519,-2178.2479,79.9949,1471.6173,1474.1975,-32.2520,8.5600,36.7779,-36.7779,0.0000,1.1375,-37.9154,1.6326,-39.5479,4.3747,-43.9227,7.1448,1349.3571,-268.3240,-279.8778,-970.0000,970.0000,-137.0652,137.0652,16.2063,0.0000,,,,3.5400,,,,36.7779,0.2505,,,36.5274,1.3644,35.1630,0.0000,35.1630,0.8466,34.3164,7.3006,0.0970,1.6736,25.2452,,,,,,,,,,,6,0,0,0,,737.0987,735.8086,-32.2520,79.9949,-23.7313,-23.7729,0.0416,1299.0759,-1089.1239,737.0987,735.8086,-32.2520,79.9949,-23.7313,-23.7729,0.0416,1299.0759,-1089.1239
-5.0921,0.4626,5.5224,11.1314,60.0000,1.0000,2.9502,0.1629,,,,,,,,,,,,-54.9178,-55.0293,0.1115,2598.1505,-2178.2465,79.9934,1471.2104,1474.1966,-37.3283,8.5600,43.2234,-43.2234,0.0000,1.3368,-44.5602,1.9296,-46.4898,4.8881,-51.3778,8.1545,1584.9500,-268.4744,-280.1002,-970.0000,970.0000,-160.9963,160.9963,17.7493,0.0000,,,,3.5400,,,,43.2234,0.2954,,,42.9279,1.5827,41.3453,0.0000,41.3453,0.9944,40.3509,8.5752,0.1569,1.9659,29.6529,,,,,,,,,,,6,0,0,0,,737.0983,735.6052,-37.3283,79.9934,-27.4589,-27.5147,0.0557,1299.0753,-1089.1233,737.0983,735.6052,-37.3283,79.9934,-27.4589,-27.5147,0.0557,1299.0753,-1089.1233
-5.5569,0.4672,7.1841,12.8050,60.0000,1.0000,2.9502,0.2119,,,,,,,,,,,,-62.5029,-62.6474,0.1445,2598.1490,-2178.2450,79.9917,1470.7960,1474.1956,-42.4960,8.5600,49.7616,-49.7616,0.0000,1.5390,-51.3006,2.2302,-53.5308,5.4321,-58.9629,9.2014,1823.2419,-268.6887,-280.3696,-970.0000,970.0000,-185.2016,185.2016,19.3077,0.0000,,,,3.5400,,,,49.7616,0.3415,,,49.4201,1.8006,47.6194,0.0000,47.6194,1.1439,46.4755,9.8645,0.2385,2.2614,34.1111,,,,,,,,,,,6,0,0,0,,737.0978,735.3980,-42.4960,79.9917,-31.2515,-31.3237,0.0722,1299.0745,-1089.1225,737.0978,735.3980,-42.4960,79.9917,-31.2515,-31.3237,0.0722,1299.0745,-1089.1225
-6.1313,0.6816,10.0000,14.8728,60.0000,1.0000,2.9920,0.2962,,,,,,,,,,,,-72.1246,-72.3171,0.1925,2598.1471,-2178.2431,79.9888,1470.2701,1474.1945,-49.0553,8.5600,58.0369,-58.0369,0.0000,1.7950,-59.8319,2.5679,-62.3997,6.1848,-68.5846,10.5476,2117.6644,-269.8030,-281.3824,-970.0000,970.0000,-215.1085,215.1085,21.5815,0.0000,,,,3.5400,,,,58.0369,0.3995,,,57.6375,2.0683,55.5691,0.0000,55.5691,1.3286,54.2405,11.6198,0.3747,2.6266,39.6195,,,,,,,,,,,6,0,0,0,,737.0973,735.1351,-49.0553,79.9888,-36.0623,-36.1585,0.0963,1299.0736,-1089.1216,737.0973,735.1351,-49.0553,79.9888,-36.0623,-36.1585,0.0963,1299.0736,-1089.1216
+2.3536,0.7071,0.2500,1.2728,60.0000,1.0000,2.9502,0.0074,,,,,,,,,,,,-11.0313,-11.0358,0.0045,2598.1556,-2178.2516,79.9991,1473.6008,1474.1997,-7.4860,8.5600,4.9202,-4.9202,0.0000,0.1522,-5.0724,0.1146,-5.1870,2.3044,-7.4913,2.5712,181.2266,-267.2752,-273.3140,-970.0000,970.0000,-18.4087,18.4087,9.0242,0.0000,,,,3.5400,,,,4.9202,0.0222,,,4.8980,0.1880,4.7100,0.0000,4.7100,0.1137,4.5963,0.9805,0.0005,0.2248,3.3906,,,,,,,,,,,6,0,0,0,,737.0999,736.8004,-7.4860,79.9991,-5.5157,-5.5179,0.0022,1299.0778,-1089.1258,737.0999,736.8004,-7.4860,79.9991,-5.5157,-5.5179,0.0022,1299.0778,-1089.1258
+2.9029,0.3916,0.6036,3.2504,60.0000,1.0000,2.9502,0.0178,,,,,,,,,,,,-19.7180,-19.7323,0.0143,2598.1551,-2178.2511,79.9987,1473.1286,1474.1994,-13.3851,8.5600,12.5654,-12.5654,0.0000,0.3886,-12.9541,0.5219,-13.4759,2.7021,-16.1780,3.6126,462.8118,-267.2839,-278.0519,-970.0000,970.0000,-47.0116,47.0116,10.3299,0.0000,,,,3.5400,,,,12.5654,0.0567,,,12.5088,0.4775,12.0312,0.0000,12.0312,0.2904,11.7409,2.5040,0.0041,0.5740,8.6588,,,,,,,,,,,6,0,0,0,,737.0997,736.5643,-13.3851,79.9987,-9.8590,-9.8662,0.0072,1299.0775,-1089.1255,737.0997,736.5643,-13.3851,79.9987,-9.8590,-9.8662,0.0072,1299.0775,-1089.1255
+3.3086,0.4198,1.1529,4.7109,60.0000,1.0000,2.9502,0.0340,,,,,,,,,,,,-26.1306,-26.1558,0.0252,2598.1546,-2178.2506,79.9980,1472.7797,1474.1991,-17.7424,8.5600,18.2150,-18.2150,0.0000,0.5634,-18.7784,0.7803,-19.5587,3.0319,-22.5906,4.3756,670.7620,-267.3382,-278.4471,-970.0000,970.0000,-68.1348,68.1348,11.7297,0.0000,,,,3.5400,,,,18.2150,0.0822,,,18.1328,0.6895,17.4433,0.0000,17.4433,0.4208,17.0225,3.6291,0.0121,0.8320,12.5493,,,,,,,,,,,6,0,0,0,,737.0996,736.3899,-17.7424,79.9980,-13.0653,-13.0779,0.0126,1299.0773,-1089.1253,737.0996,736.3899,-17.7424,79.9980,-13.0653,-13.0779,0.0126,1299.0773,-1089.1253
+3.7370,0.4371,1.9121,6.2533,60.0000,1.0000,2.9502,0.0564,,,,,,,,,,,,-32.9717,-33.0119,0.0401,2598.1539,-2178.2499,79.9972,1472.4073,1474.1987,-22.3931,8.5600,24.1874,-24.1874,0.0000,0.7481,-24.9355,1.0553,-25.9907,3.4410,-29.4317,5.2443,890.3773,-267.4330,-278.7508,-970.0000,970.0000,-90.4429,90.4429,13.1873,0.0000,,,,3.5400,,,,24.1874,0.1092,,,24.0782,0.9117,23.1665,0.0000,23.1665,0.5586,22.6079,4.8173,0.0281,1.1044,16.6581,,,,,,,,,,,6,0,0,0,,737.0994,736.2036,-22.3931,79.9972,-16.4859,-16.5059,0.0201,1299.0770,-1089.1250,737.0994,736.2036,-22.3931,79.9972,-16.4859,-16.5059,0.0201,1299.0770,-1089.1250
+4.1799,0.4486,2.8899,7.8475,60.0000,1.0000,2.9502,0.0853,,,,,,,,,,,,-40.1491,-40.2087,0.0595,2598.1530,-2178.2490,79.9962,1472.0162,1474.1982,-27.2749,8.5600,30.3694,-30.3694,0.0000,0.9393,-31.3086,1.3405,-32.6491,3.9600,-36.6091,6.2398,1117.3629,-267.5724,-279.0286,-970.0000,970.0000,-113.4997,113.4997,14.6833,0.0000,,,,3.5400,,,,30.3694,0.1372,,,30.2322,1.1398,29.0924,0.0000,29.0924,0.7010,28.3913,6.0454,0.0552,1.3859,20.9048,,,,,,,,,,,6,0,0,0,,737.0991,736.0081,-27.2749,79.9962,-20.0746,-20.1043,0.0298,1299.0765,-1089.1245,737.0991,736.0081,-27.2749,79.9962,-20.0746,-20.1043,0.0298,1299.0765,-1089.1245
+4.6324,0.4566,4.0920,9.4768,60.0000,1.0000,2.9502,0.1207,,,,,,,,,,,,-47.3674,-47.4503,0.0829,2598.1519,-2178.2479,79.9949,1471.6225,1474.1975,-32.1872,8.5600,36.6934,-36.6934,0.0000,1.1348,-37.8282,1.6326,-39.4608,4.3666,-43.8274,7.1340,1349.3571,-267.7074,-279.2612,-970.0000,970.0000,-137.0652,137.0652,16.2063,0.0000,,,,3.5400,,,,36.6934,0.1660,,,36.5274,1.3644,35.1630,0.0000,35.1630,0.8466,34.3164,7.3006,0.0970,1.6736,25.2452,,,,,,,,,,,6,0,0,0,,737.0987,735.8112,-32.1872,79.9949,-23.6837,-23.7251,0.0414,1299.0759,-1089.1239,737.0987,735.8112,-32.1872,79.9949,-23.6837,-23.7251,0.0414,1299.0759,-1089.1239
+5.0921,0.4626,5.5224,11.1314,60.0000,1.0000,2.9502,0.1629,,,,,,,,,,,,-54.8050,-54.9160,0.1110,2598.1505,-2178.2465,79.9934,1471.2165,1474.1966,-37.2515,8.5600,43.1232,-43.1232,0.0000,1.3337,-44.4569,1.9296,-46.3865,4.8784,-51.2650,8.1417,1584.9500,-267.8523,-279.4781,-970.0000,970.0000,-160.9963,160.9963,17.7493,0.0000,,,,3.5400,,,,43.1232,0.1953,,,42.9279,1.5827,41.3453,0.0000,41.3453,0.9944,40.3509,8.5752,0.1569,1.9659,29.6529,,,,,,,,,,,6,0,0,0,,737.0983,735.6083,-37.2515,79.9934,-27.4025,-27.4580,0.0555,1299.0753,-1089.1233,737.0983,735.6083,-37.2515,79.9934,-27.4025,-27.4580,0.0555,1299.0753,-1089.1233
+5.5569,0.4672,7.1841,12.8050,60.0000,1.0000,2.9502,0.2119,,,,,,,,,,,,-62.3738,-62.5176,0.1439,2598.1490,-2178.2450,79.9917,1470.8030,1474.1957,-42.4080,8.5600,49.6452,-49.6452,0.0000,1.5354,-51.1806,2.2302,-53.4108,5.4229,-58.8338,9.1886,1823.2419,-268.0603,-279.7412,-970.0000,970.0000,-185.2016,185.2016,19.3077,0.0000,,,,3.5400,,,,49.6452,0.2251,,,49.4201,1.8006,47.6194,0.0000,47.6194,1.1439,46.4755,9.8645,0.2385,2.2614,34.1111,,,,,,,,,,,6,0,0,0,,737.0978,735.4015,-42.4080,79.9917,-31.1869,-31.2588,0.0719,1299.0745,-1089.1225,737.0978,735.4015,-42.4080,79.9917,-31.1869,-31.2588,0.0719,1299.0745,-1089.1225
+6.1313,0.6816,10.0000,14.8728,60.0000,1.0000,2.9920,0.2962,,,,,,,,,,,,-71.9739,-72.1656,0.1917,2598.1471,-2178.2431,79.9889,1470.2783,1474.1945,-48.9526,8.5600,57.8998,-57.8998,0.0000,1.7907,-59.6905,2.5679,-62.2584,6.1755,-68.4339,10.5341,2117.6644,-269.1657,-280.7451,-970.0000,970.0000,-215.1085,215.1085,21.5815,0.0000,,,,3.5400,,,,57.8998,0.2624,,,57.6375,2.0683,55.5691,0.0000,55.5691,1.3286,54.2405,11.6198,0.3747,2.6266,39.6195,,,,,,,,,,,6,0,0,0,,737.0973,735.1392,-48.9526,79.9889,-35.9870,-36.0828,0.0959,1299.0736,-1089.1216,737.0973,735.1392,-48.9526,79.9889,-35.9870,-36.0828,0.0959,1299.0736,-1089.1216
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder_LongHaul_short.vmod b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder_LongHaul_short.vmod
index 66a5e66637..6acb4fc759 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder_LongHaul_short.vmod
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder_LongHaul_short.vmod
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.7.7.2644-DEV - 29.03.2022 17:43
+# VECTO-DEV 0.7.7.2658-DEV - 12.04.2022 15:02
 time [s],dt [s],dist [m],v_act [km/h],v_targ [km/h],acc [m/s^2],grad [%],altitude [m],Gear [-],n_ice_avg [1/min],T_ice_fcmap [Nm],Tq_ice_full [Nm],Tq_ice_drag [Nm],P_ice_fcmap [kW],P_ice_full [kW],P_ice_full_stat [kW],P_ice_drag [kW],P_ice_inertia [kW],P_ice_out [kW],P_REESS_T [kW],P_REESS_int [kW],P_REESS_loss [kW],P_REESS_charge_max [kW],P_REESS_discharge_max [kW],REESS SOC [%],U_REESS_terminal [V],U_0_REESS [V],I_REESS [A],i_E3-em [-],P_E3_out [kW],P_E3_mech [kW],P_E3_in [kW],P_E3_transm_loss [kW],P_E3-em_mech [kW],P_E3-em_inertia_loss [kW],P_E3-em_mech_map [kW],P_E3-em_loss [kW],P_E3-em_el [kW],P_E3_loss [kW],n_E3-em_avg [1/min],T_E3-em [Nm],T_E3-em_map [Nm],T_E3-em_drive_max [Nm],T_E3-em_gen_max [Nm],P_E3-em_drive_max [kW],P_E3-em_gen_max [kW],EM_OVL-E3-em [%],EM_E3_off,P_clutch_loss [kW],P_clutch_out [kW],P_aux_mech [kW],P_aux_el [kW],P_gbx_in [kW],P_gbx_loss [kW],P_gbx_inertia [kW],P_ret_in [kW],P_ret_loss [kW],P_angle_in [kW],P_angle_loss [kW],P_axle_in [kW],P_axle_loss [kW],P_brake_in [kW],P_brake_loss [kW],P_wheel_in [kW],P_wheel_inertia [kW],P_trac [kW],P_slope [kW],P_air [kW],P_roll [kW],P_veh_inertia [kW],n_gbx_out_avg [1/min],T_gbx_out [Nm],T_gbx_in [Nm],P_WHR_el [kW],P_WHR_el_corr [kW],P_WHR_mech [kW],P_WHR_mech_corr [kW],P_aux_ESS_mech_ICE_off [kW],P_aux_ESS_mech_ICE_on [kW],P_ice_start [kW],DriverAction,EcoRollConditionsMet,PCCSegment,PCCState,ICE On,U0_reess_0,U_reess_terminal_0,I_reess_0,REESSStateOfCharge_0,P_reess_terminal_0,P_reess_int_0,P_reess_loss_0,P_reess_charge_max_0,P_reess_discharge_max_0,U0_reess_1,U_reess_terminal_1,I_reess_1,REESSStateOfCharge_1,P_reess_terminal_1,P_reess_int_1,P_reess_loss_1,P_reess_charge_max_1,P_reess_discharge_max_1
 0.5000,1.0000,0.0000,0.0000,0.0000,0.0000,2.9502,0.0000,,,,,,,,,,,,-3.5400,-3.5405,0.0005,2598.1560,-2178.2520,79.9998,1474.0079,1474.2000,-2.4016,8.5600,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,,0.0000,0.0000,3.3333,1.0000,,,,3.5400,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,,,,0,0,0,0,,737.1000,737.0039,-2.4016,79.9998,-1.7700,-1.7702,0.0002,1299.0780,-1089.1260,737.1000,737.0039,-2.4016,79.9998,-1.7700,-1.7702,0.0002,1299.0780,-1089.1260
 1.5000,1.0000,0.0000,0.0000,0.0000,0.0000,2.9502,0.0000,,,,,,,,,,,,-3.5400,-3.5405,0.0005,2598.1558,-2178.2518,79.9996,1474.0077,1474.1999,-2.4016,8.5600,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,0.0000,,0.0000,0.0000,6.6667,1.0000,,,,3.5400,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,,,,0,0,0,0,,737.0999,737.0039,-2.4016,79.9996,-1.7700,-1.7702,0.0002,1299.0779,-1089.1259,737.0999,737.0039,-2.4016,79.9996,-1.7700,-1.7702,0.0002,1299.0779,-1089.1259
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vfld b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vfld
deleted file mode 100644
index 750d4048ef..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vfld
+++ /dev/null
@@ -1,202 +0,0 @@
-engine speed [1/min], full load torque [Nm], motoring torque [Nm]
-600,1188,-138
-608,1206.92,-138.2
-616,1225.84,-138.4
-624,1244.76,-138.6
-632,1263.68,-138.8
-640,1282.6,-139
-648,1301.52,-139.2
-656,1320.44,-139.4
-664,1339.36,-139.6
-672,1358.28,-139.8
-680,1377.2,-140
-688,1396.12,-140.2
-696,1415.04,-140.4
-704,1433.96,-140.6
-712,1452.88,-140.8
-720,1471.8,-141
-728,1490.72,-141.2
-736,1509.64,-141.4
-744,1528.56,-141.6
-752,1547.48,-141.8
-760,1566.4,-142
-768,1585.32,-142.2
-776,1604.24,-142.4
-784,1623.16,-142.6
-792,1642.08,-142.8
-800,1661,-143
-808,1679.92,-143.36
-816,1698.84,-143.72
-824,1717.76,-144.08
-832,1736.68,-144.44
-840,1755.6,-144.8
-848,1774.52,-145.16
-856,1793.44,-145.52
-864,1812.36,-145.88
-872,1831.28,-146.24
-880,1850.2,-146.6
-888,1869.12,-146.96
-896,1888.04,-147.32
-904,1906.96,-147.68
-912,1925.88,-148.04
-920,1944.8,-148.4
-928,1963.72,-148.76
-936,1982.64,-149.12
-944,2001.56,-149.48
-952,2020.48,-149.84
-960,2039.4,-150.2
-968,2058.32,-150.56
-976,2077.24,-150.92
-984,2096.16,-151.28
-992,2115.08,-151.64
-1000,2134,-152
-1008,2134,-152.52
-1016,2134,-153.04
-1024,2134,-153.56
-1032,2134,-154.08
-1040,2134,-154.6
-1048,2134,-155.12
-1056,2134,-155.64
-1064,2134,-156.16
-1072,2134,-156.68
-1080,2134,-157.2
-1088,2134,-157.72
-1096,2134,-158.24
-1104,2134,-158.76
-1112,2134,-159.28
-1120,2134,-159.8
-1128,2134,-160.32
-1136,2134,-160.84
-1144,2134,-161.36
-1152,2134,-161.88
-1160,2134,-162.4
-1168,2134,-162.92
-1176,2134,-163.44
-1184,2134,-163.96
-1192,2134,-164.48
-1200,2134,-165
-1208,2134,-165.88
-1216,2134,-166.76
-1224,2134,-167.64
-1232,2134,-168.52
-1240,2134,-169.4
-1248,2134,-170.28
-1256,2134,-171.16
-1264,2134,-172.04
-1272,2134,-172.92
-1280,2134,-173.8
-1288,2134,-174.68
-1296,2134,-175.56
-1304,2134,-176.44
-1312,2134,-177.32
-1320,2134,-178.2
-1328,2134,-179.08
-1336,2134,-179.96
-1344,2134,-180.84
-1352,2134,-181.72
-1360,2134,-182.6
-1368,2134,-183.48
-1376,2134,-184.36
-1384,2134,-185.24
-1392,2134,-186.12
-1400,2134,-187
-1408,2125.76,-188.2
-1416,2117.52,-189.4
-1424,2109.28,-190.6
-1432,2101.04,-191.8
-1440,2092.8,-193
-1448,2084.56,-194.2
-1456,2076.32,-195.4
-1464,2068.08,-196.6
-1472,2059.84,-197.8
-1480,2051.6,-199
-1488,2043.36,-200.2
-1496,2035.12,-201.3911
-1504,2026.88,-202.5793
-1512,2018.64,-203.7675
-1520,2010.4,-204.9557
-1528,2002.16,-206.1439
-1536,1993.92,-207.3321
-1544,1985.68,-208.5203
-1552,1977.44,-209.7085
-1560,1969.2,-210.8967
-1568,1960.96,-212.0849
-1576,1952.72,-213.2731
-1584,1944.48,-214.4613
-1592,1936.24,-215.6495
-1600,1928,-216.8377
-1608,1919.76,-218.0259
-1616,1911.52,-219.16
-1624,1903.28,-220.24
-1632,1895.04,-221.32
-1640,1886.8,-222.4
-1648,1878.56,-223.48
-1656,1870.32,-224.56
-1664,1862.08,-225.64
-1672,1853.84,-226.72
-1680,1845.6,-227.8
-1688,1837.36,-228.88
-1696,1829.12,-229.96
-1704,1820.88,-231.04
-1712,1812.64,-232.12
-1720,1804.4,-233.2
-1728,1796.16,-234.28
-1736,1787.92,-235.36
-1744,1779.68,-236.44
-1752,1771.44,-237.52
-1760,1763.2,-238.6
-1768,1754.96,-239.68
-1776,1746.72,-240.76
-1784,1738.48,-241.84
-1792,1730.24,-242.92
-1800,1722,-244
-1808,1703.24,-245.36
-1816,1684.48,-246.72
-1824,1665.72,-248.08
-1832,1646.96,-249.44
-1840,1628.2,-250.8
-1848,1609.44,-252.16
-1856,1590.68,-253.52
-1864,1571.92,-254.88
-1872,1553.16,-256.24
-1880,1534.4,-257.6
-1888,1515.64,-258.96
-1896,1496.88,-260.32
-1904,1478.12,-261.68
-1912,1459.36,-263.04
-1920,1440.6,-264.4
-1928,1421.84,-265.76
-1936,1403.08,-267.12
-1944,1384.32,-268.48
-1952,1365.56,-269.84
-1960,1346.8,-271.2
-1968,1328.04,-272.56
-1976,1309.28,-273.92
-1984,1290.52,-275.28
-1992,1271.76,-276.64
-2000,1253,-278
-2008,1234.28,-279.36
-2016,1215.56,-280.72
-2024,1196.84,-282.08
-2032,1178.12,-283.44
-2040,1159.4,-284.8
-2048,1140.68,-286.16
-2056,1121.96,-287.52
-2064,1103.24,-288.88
-2072,1084.52,-290.24
-2080,1065.8,-291.6
-2088,1047.08,-292.96
-2096,1028.36,-294.32
-2104,978.24,-295.68
-2112,896.72,-297.04
-2120,815.2,-298.4
-2128,733.68,-299.76
-2136,652.16,-301.12
-2144,570.64,-302.48
-2152,489.12,-303.84
-2160,407.6,-305.2
-2168,326.08,-306.56
-2176,244.56,-307.92
-2184,163.04,-309.28
-2192,81.52,-310.64
-2200,0,-312
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vmap b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vmap
deleted file mode 100644
index eea08f963f..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/325kW.vmap
+++ /dev/null
@@ -1,140 +0,0 @@
-engine speed [rpm], torque [Nm], fuel consumption [g/h]
-500,-135.5,0
-500,0,1355
-500,213.4,3412.291
-500,426.8,5830.1
-500,640.2,8316.426
-500,853.6,10439.87
-500,1067,12823.69
-500,1188,14228.79
-500,1401.4,16628.66
-600,-138,0
-600,0,1355
-600,213.4,3412.291
-600,426.8,5830.1
-600,640.2,8316.426
-600,853.6,10439.87
-600,1067,12823.69
-600,1188,14228.79
-600,1401.4,16628.66
-751,-141.775,0
-750.9,0,1649.255
-750.9,213.4,4157.795
-750.9,426.8,7149.494
-750.9,640.2,10037.08
-750.9,853.6,12957.07
-750.9,1067,16055.22
-750.9,1280.4,19231.36
-750.9,1493.8,22400.17
-750.9,1544.879,23213.92
-751,1758.279,26392.93
-902,-147.59,0
-901.8,0,2210.735
-901.8,213.4,5204.867
-901.8,426.8,8515.462
-901.8,640.2,11804.75
-901.8,853.6,15410.55
-901.8,1067,19081.7
-901.8,1280.4,22742.96
-901.8,1493.8,26543.87
-901.8,1707.2,30534.68
-901.8,1901.757,34352.75
-902,2115.157,38403.27
-1053,-155.445,0
-1052.7,0,2768.035
-1052.7,213.4,6228.407
-1052.7,426.8,9836.041
-1052.7,640.2,13624.5
-1052.7,853.6,17854.95
-1052.7,1067,22072.71
-1052.7,1280.4,26161.13
-1052.7,1493.8,30525.55
-1052.7,1707.2,35019.18
-1052.7,1920.6,39913.3
-1052.7,2134,45438.16
-1053,2347.4,50542.53
-1204,-165.44,0
-1203.6,0,3086.704
-1203.6,213.4,6943.027
-1203.6,426.8,11040.37
-1203.6,640.2,15504.65
-1203.6,853.6,20335.89
-1203.6,1067,25176.6
-1203.6,1280.4,29782.22
-1203.6,1493.8,34642.24
-1203.6,1707.2,39786.14
-1203.6,1920.6,45254.8
-1203.6,2134,51129.03
-1204,2347.4,56732.88
-1367,-183.37,0
-1367.1,0,3845.344
-1367.1,213.4,7981.742
-1367.1,426.8,12796.69
-1367.1,640.2,17789.2
-1367.1,853.6,22854.21
-1367.1,1067,28302.84
-1367.1,1280.4,33739.91
-1367.1,1493.8,39393.87
-1367.1,1707.2,45836.33
-1367.1,1920.6,52078.71
-1367.1,2134,58296.41
-1367,2347.4,64530.56
-1490,-200.5,0
-1489.6,0,4373.424
-1489.6,213.4,8861.484
-1489.6,426.8,14090.86
-1489.6,640.2,19518.29
-1489.6,853.6,25092.8
-1489.6,1067,30873.69
-1489.6,1280.4,36865.42
-1489.6,1493.8,43095.57
-1489.6,1707.2,50249.81
-1489.6,1920.6,57035.25
-1489.6,2041.712,60609.5
-1490,2255.112,67311.83
-1612,-218.62,0
-1612.2,0,4904.015
-1612.2,213.4,9810.482
-1612.2,426.8,15403.9
-1612.2,640.2,21301.35
-1612.2,853.6,27492.32
-1612.2,1067,33580.96
-1612.2,1280.4,40114.61
-1612.2,1493.8,46914.77
-1612.2,1707.2,54666.14
-1612.2,1915.434,61862.91
-1612,2128.834,69491.99
-1735,-235.225,0
-1734.7,0,5586.953
-1734.7,213.4,11041.15
-1734.7,426.8,16949.24
-1734.7,640.2,23500.23
-1734.7,853.6,30159.59
-1734.7,1067,36741.18
-1734.7,1280.4,43923.85
-1734.7,1493.8,51295.21
-1734.7,1707.2,59469.31
-1734.7,1789.259,62731.31
-1735,2002.659,70935.23
-1857,-253.69,0
-1857.3,0,6673.839
-1857.3,213.4,12518.56
-1857.3,426.8,18687.88
-1857.3,640.2,25652.39
-1857.3,853.6,33003.08
-1857.3,1067,40438.09
-1857.3,1280.4,48117.52
-1857.3,1493.8,55848.59
-1857.3,1587.631,59434.17
-1857,1801.031,67215.39
-1957,-270.69,0
-1957.3,0,6673.839
-1957.3,213.4,12518.56
-1957.3,426.8,18687.88
-1957.3,640.2,25652.39
-1957.3,853.6,33003.08
-1957.3,1067,40438.09
-1957.3,1280.4,48117.52
-1957.3,1493.8,55848.59
-1957.3,1587.631,59434.17
-1957,1801.031,67215.39
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/AMT_12.vgbx
deleted file mode 100644
index ae0a1a7eba..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/AMT_12.vgbx
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": "",
-    "Date": "2020-08-21T09:25:38.1210499Z",
-    "AppVersion": "3",
-    "FileVersion": 6
-  },
-  "Body": {
-    "SavedInDeclMode": false,
-    "ModelName": "tractor_12gear_example",
-    "Inertia": 0.0,
-    "TracInt": 1.0,
-    "Gears": [
-      {
-        "Ratio": 2.64,
-        "LossMap": "Axle_4x2_Tractor.vtlm"
-      },
-      {
-        "Ratio": 14.93,
-        "LossMap": "Gear_1.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 11.64,
-        "LossMap": "Gear_2.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 9.02,
-        "LossMap": "Gear_3.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 7.04,
-        "LossMap": "Gear_4.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 5.64,
-        "LossMap": "Gear_5.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 4.4,
-        "LossMap": "Gear_6.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 3.39,
-        "LossMap": "Gear_7.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 2.65,
-        "LossMap": "Gear_8.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 2.05,
-        "LossMap": "Gear_9.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 1.6,
-        "LossMap": "Gear_10.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 1.28,
-        "LossMap": "Gear_11.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      },
-      {
-        "Ratio": 1.0,
-        "LossMap": "Gear_12.vtlm",
-        "ShiftPolygon": "",
-        "MaxTorque": "",
-        "MaxSpeed": ""
-      }
-    ],
-    "TqReserve": 20.0,
-    "ShiftTime": 2.0,
-    "StartTqReserve": 20.0,
-    "StartSpeed": 2.0,
-    "StartAcc": 0.6,
-    "GearboxType": "AMT",
-    "TorqueConverter": {
-      "Enabled": false
-    },
-    "DownshiftAfterUpshiftDelay": 6.0,
-    "UpshiftAfterDownshiftDelay": 6.0,
-    "UpshiftMinAcceleration": 0.1,
-    "PowershiftShiftTime": 0.8
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Default.vrlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Default.vrlm
deleted file mode 100644
index eb575b9997..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Default.vrlm
+++ /dev/null
@@ -1,32 +0,0 @@
-Retarder Speed [1/min],Torque Loss [Nm]
-0,10
-100,10
-200,10.1
-300,10.2
-400,10.3
-500,10.5
-600,10.7
-700,11
-800,11.3
-900,11.6
-1000,12
-1100,12.4
-1200,12.9
-1300,13.4
-1400,13.9
-1500,14.5
-1600,15.1
-1700,15.8
-1800,16.5
-1900,17.2
-2000,18
-2100,18.8
-2200,19.7
-2300,20.6
-2400,21.5
-2500,22.5
-2600,23.5
-2700,24.6
-2800,25.7
-2900,26.8
-3000,28
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_1.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_1.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_10.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_10.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_10.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_11.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_11.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_11.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_12.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_12.vtlm
deleted file mode 100644
index d30c0dbb04..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_12.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,74.2
-0,-5000.0,69.2
-0,-4500.0,59.2
-0,-4000.0,59.2
-0,-3500.0,54.2
-0,-3000.0,49.2
-0,-2500.0,44.2
-0,-2000.0,39.2
-0,-1600.0,35.2
-0,-1200.0,31.2
-0,-900.0,28.2
-0,-600.0,25.2
-0,-400.0,23.2
-0,-200.0,21.2
-0,0.0,21.2
-0,200.0,21.2
-0,400.0,23.2
-0,600.0,25.2
-0,900.0,28.2
-0,1200.0,31.2
-0,1600.0,35.2
-0,2000.0,39.2
-0,2500.0,44.2
-0,3000.0,49.2
-0,3500.0,54.2
-0,4000.0,59.2
-0,4500.0,64.2
-0,5000.0,69.2
-0,5500.0,74.2
-600,-5500.0,74.2
-600,-5000.0,69.2
-600,-4500.0,59.2
-600,-4000.0,59.2
-600,-3500.0,54.2
-600,-3000.0,49.2
-600,-2500.0,44.2
-600,-2000.0,39.2
-600,-1600.0,35.2
-600,-1200.0,31.2
-600,-900.0,28.2
-600,-600.0,25.2
-600,-400.0,23.2
-600,-200.0,21.2
-600,0.0,21.2
-600,200.0,21.2
-600,400.0,23.2
-600,600.0,25.2
-600,900.0,28.2
-600,1200.0,31.2
-600,1600.0,35.2
-600,2000.0,39.2
-600,2500.0,44.2
-600,3000.0,49.2
-600,3500.0,54.2
-600,4000.0,59.2
-600,4500.0,64.2
-600,5000.0,69.2
-600,5500.0,74.2
-900,-5500.0,77.8
-900,-5000.0,72.8
-900,-4500.0,62.8
-900,-4000.0,62.8
-900,-3500.0,57.8
-900,-3000.0,52.8
-900,-2500.0,47.8
-900,-2000.0,42.8
-900,-1600.0,38.8
-900,-1200.0,34.8
-900,-900.0,31.8
-900,-600.0,28.8
-900,-400.0,26.8
-900,-200.0,24.8
-900,0.0,24.8
-900,200.0,24.8
-900,400.0,26.8
-900,600.0,28.8
-900,900.0,31.8
-900,1200.0,34.8
-900,1600.0,38.8
-900,2000.0,42.8
-900,2500.0,47.8
-900,3000.0,52.8
-900,3500.0,57.8
-900,4000.0,62.8
-900,4500.0,67.8
-900,5000.0,72.8
-900,5500.0,77.8
-1200,-5500.0,81.4
-1200,-5000.0,76.4
-1200,-4500.0,66.4
-1200,-4000.0,66.4
-1200,-3500.0,61.4
-1200,-3000.0,56.4
-1200,-2500.0,51.4
-1200,-2000.0,46.4
-1200,-1600.0,42.4
-1200,-1200.0,38.4
-1200,-900.0,35.4
-1200,-600.0,32.4
-1200,-400.0,30.4
-1200,-200.0,28.4
-1200,0.0,28.4
-1200,200.0,28.4
-1200,400.0,30.4
-1200,600.0,32.4
-1200,900.0,35.4
-1200,1200.0,38.4
-1200,1600.0,42.4
-1200,2000.0,46.4
-1200,2500.0,51.4
-1200,3000.0,56.4
-1200,3500.0,61.4
-1200,4000.0,66.4
-1200,4500.0,71.4
-1200,5000.0,76.4
-1200,5500.0,81.4
-1600,-5500.0,86.2
-1600,-5000.0,81.2
-1600,-4500.0,71.2
-1600,-4000.0,71.2
-1600,-3500.0,66.2
-1600,-3000.0,61.2
-1600,-2500.0,56.2
-1600,-2000.0,51.2
-1600,-1600.0,47.2
-1600,-1200.0,43.2
-1600,-900.0,40.2
-1600,-600.0,37.2
-1600,-400.0,35.2
-1600,-200.0,33.2
-1600,0.0,33.2
-1600,200.0,33.2
-1600,400.0,35.2
-1600,600.0,37.2
-1600,900.0,40.2
-1600,1200.0,43.2
-1600,1600.0,47.2
-1600,2000.0,51.2
-1600,2500.0,56.2
-1600,3000.0,61.2
-1600,3500.0,66.2
-1600,4000.0,71.2
-1600,4500.0,76.2
-1600,5000.0,81.2
-1600,5500.0,86.2
-2000,-5500.0,91.0
-2000,-5000.0,86.0
-2000,-4500.0,76.0
-2000,-4000.0,76.0
-2000,-3500.0,71.0
-2000,-3000.0,66.0
-2000,-2500.0,61.0
-2000,-2000.0,56.0
-2000,-1600.0,52.0
-2000,-1200.0,48.0
-2000,-900.0,45.0
-2000,-600.0,42.0
-2000,-400.0,40.0
-2000,-200.0,38.0
-2000,0.0,38.0
-2000,200.0,38.0
-2000,400.0,40.0
-2000,600.0,42.0
-2000,900.0,45.0
-2000,1200.0,48.0
-2000,1600.0,52.0
-2000,2000.0,56.0
-2000,2500.0,61.0
-2000,3000.0,66.0
-2000,3500.0,71.0
-2000,4000.0,76.0
-2000,4500.0,81.0
-2000,5000.0,86.0
-2000,5500.0,91.0
-2500,-5500.0,97.0
-2500,-5000.0,92.0
-2500,-4500.0,82.0
-2500,-4000.0,82.0
-2500,-3500.0,77.0
-2500,-3000.0,72.0
-2500,-2500.0,67.0
-2500,-2000.0,62.0
-2500,-1600.0,58.0
-2500,-1200.0,54.0
-2500,-900.0,51.0
-2500,-600.0,48.0
-2500,-400.0,46.0
-2500,-200.0,44.0
-2500,0.0,44.0
-2500,200.0,44.0
-2500,400.0,46.0
-2500,600.0,48.0
-2500,900.0,51.0
-2500,1200.0,54.0
-2500,1600.0,58.0
-2500,2000.0,62.0
-2500,2500.0,67.0
-2500,3000.0,72.0
-2500,3500.0,77.0
-2500,4000.0,82.0
-2500,4500.0,87.0
-2500,5000.0,92.0
-2500,5500.0,97.0
-3000,-5500.0,103.0
-3000,-5000.0,98.0
-3000,-4500.0,88.0
-3000,-4000.0,88.0
-3000,-3500.0,83.0
-3000,-3000.0,78.0
-3000,-2500.0,73.0
-3000,-2000.0,68.0
-3000,-1600.0,64.0
-3000,-1200.0,60.0
-3000,-900.0,57.0
-3000,-600.0,54.0
-3000,-400.0,52.0
-3000,-200.0,50.0
-3000,0.0,50.0
-3000,200.0,50.0
-3000,400.0,52.0
-3000,600.0,54.0
-3000,900.0,57.0
-3000,1200.0,60.0
-3000,1600.0,64.0
-3000,2000.0,68.0
-3000,2500.0,73.0
-3000,3000.0,78.0
-3000,3500.0,83.0
-3000,4000.0,88.0
-3000,4500.0,93.0
-3000,5000.0,98.0
-3000,5500.0,103.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_2.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_2.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_3.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_3.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_4.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_4.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_5.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_5.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_6.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_6.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_7.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_7.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_7.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_8.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_8.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_8.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_9.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_9.vtlm
deleted file mode 100644
index ea00afe57c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Gear_9.vtlm
+++ /dev/null
@@ -1,233 +0,0 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
-0,-5500.0,239.2
-0,-5000.0,219.2
-0,-4500.0,179.2
-0,-4000.0,179.2
-0,-3500.0,159.2
-0,-3000.0,139.2
-0,-2500.0,119.2
-0,-2000.0,99.2
-0,-1600.0,83.2
-0,-1200.0,67.2
-0,-900.0,55.2
-0,-600.0,43.2
-0,-400.0,35.2
-0,-200.0,27.2
-0,0.0,27.2
-0,200.0,27.2
-0,400.0,35.2
-0,600.0,43.2
-0,900.0,55.2
-0,1200.0,67.2
-0,1600.0,83.2
-0,2000.0,99.2
-0,2500.0,119.2
-0,3000.0,139.2
-0,3500.0,159.2
-0,4000.0,179.2
-0,4500.0,199.2
-0,5000.0,219.2
-0,5500.0,239.2
-600,-5500.0,239.2
-600,-5000.0,219.2
-600,-4500.0,179.2
-600,-4000.0,179.2
-600,-3500.0,159.2
-600,-3000.0,139.2
-600,-2500.0,119.2
-600,-2000.0,99.2
-600,-1600.0,83.2
-600,-1200.0,67.2
-600,-900.0,55.2
-600,-600.0,43.2
-600,-400.0,35.2
-600,-200.0,27.2
-600,0.0,27.2
-600,200.0,27.2
-600,400.0,35.2
-600,600.0,43.2
-600,900.0,55.2
-600,1200.0,67.2
-600,1600.0,83.2
-600,2000.0,99.2
-600,2500.0,119.2
-600,3000.0,139.2
-600,3500.0,159.2
-600,4000.0,179.2
-600,4500.0,199.2
-600,5000.0,219.2
-600,5500.0,239.2
-900,-5500.0,242.8
-900,-5000.0,222.8
-900,-4500.0,182.8
-900,-4000.0,182.8
-900,-3500.0,162.8
-900,-3000.0,142.8
-900,-2500.0,122.8
-900,-2000.0,102.8
-900,-1600.0,86.8
-900,-1200.0,70.8
-900,-900.0,58.8
-900,-600.0,46.8
-900,-400.0,38.8
-900,-200.0,30.8
-900,0.0,30.8
-900,200.0,30.8
-900,400.0,38.8
-900,600.0,46.8
-900,900.0,58.8
-900,1200.0,70.8
-900,1600.0,86.8
-900,2000.0,102.8
-900,2500.0,122.8
-900,3000.0,142.8
-900,3500.0,162.8
-900,4000.0,182.8
-900,4500.0,202.8
-900,5000.0,222.8
-900,5500.0,242.8
-1200,-5500.0,246.4
-1200,-5000.0,226.4
-1200,-4500.0,186.4
-1200,-4000.0,186.4
-1200,-3500.0,166.4
-1200,-3000.0,146.4
-1200,-2500.0,126.4
-1200,-2000.0,106.4
-1200,-1600.0,90.4
-1200,-1200.0,74.4
-1200,-900.0,62.4
-1200,-600.0,50.4
-1200,-400.0,42.4
-1200,-200.0,34.4
-1200,0.0,34.4
-1200,200.0,34.4
-1200,400.0,42.4
-1200,600.0,50.4
-1200,900.0,62.4
-1200,1200.0,74.4
-1200,1600.0,90.4
-1200,2000.0,106.4
-1200,2500.0,126.4
-1200,3000.0,146.4
-1200,3500.0,166.4
-1200,4000.0,186.4
-1200,4500.0,206.4
-1200,5000.0,226.4
-1200,5500.0,246.4
-1600,-5500.0,251.2
-1600,-5000.0,231.2
-1600,-4500.0,191.2
-1600,-4000.0,191.2
-1600,-3500.0,171.2
-1600,-3000.0,151.2
-1600,-2500.0,131.2
-1600,-2000.0,111.2
-1600,-1600.0,95.2
-1600,-1200.0,79.2
-1600,-900.0,67.2
-1600,-600.0,55.2
-1600,-400.0,47.2
-1600,-200.0,39.2
-1600,0.0,39.2
-1600,200.0,39.2
-1600,400.0,47.2
-1600,600.0,55.2
-1600,900.0,67.2
-1600,1200.0,79.2
-1600,1600.0,95.2
-1600,2000.0,111.2
-1600,2500.0,131.2
-1600,3000.0,151.2
-1600,3500.0,171.2
-1600,4000.0,191.2
-1600,4500.0,211.2
-1600,5000.0,231.2
-1600,5500.0,251.2
-2000,-5500.0,256.0
-2000,-5000.0,236.0
-2000,-4500.0,196.0
-2000,-4000.0,196.0
-2000,-3500.0,176.0
-2000,-3000.0,156.0
-2000,-2500.0,136.0
-2000,-2000.0,116.0
-2000,-1600.0,100.0
-2000,-1200.0,84.0
-2000,-900.0,72.0
-2000,-600.0,60.0
-2000,-400.0,52.0
-2000,-200.0,44.0
-2000,0.0,44.0
-2000,200.0,44.0
-2000,400.0,52.0
-2000,600.0,60.0
-2000,900.0,72.0
-2000,1200.0,84.0
-2000,1600.0,100.0
-2000,2000.0,116.0
-2000,2500.0,136.0
-2000,3000.0,156.0
-2000,3500.0,176.0
-2000,4000.0,196.0
-2000,4500.0,216.0
-2000,5000.0,236.0
-2000,5500.0,256.0
-2500,-5500.0,262.0
-2500,-5000.0,242.0
-2500,-4500.0,202.0
-2500,-4000.0,202.0
-2500,-3500.0,182.0
-2500,-3000.0,162.0
-2500,-2500.0,142.0
-2500,-2000.0,122.0
-2500,-1600.0,106.0
-2500,-1200.0,90.0
-2500,-900.0,78.0
-2500,-600.0,66.0
-2500,-400.0,58.0
-2500,-200.0,50.0
-2500,0.0,50.0
-2500,200.0,50.0
-2500,400.0,58.0
-2500,600.0,66.0
-2500,900.0,78.0
-2500,1200.0,90.0
-2500,1600.0,106.0
-2500,2000.0,122.0
-2500,2500.0,142.0
-2500,3000.0,162.0
-2500,3500.0,182.0
-2500,4000.0,202.0
-2500,4500.0,222.0
-2500,5000.0,242.0
-2500,5500.0,262.0
-3000,-5500.0,268.0
-3000,-5000.0,248.0
-3000,-4500.0,208.0
-3000,-4000.0,208.0
-3000,-3500.0,188.0
-3000,-3000.0,168.0
-3000,-2500.0,148.0
-3000,-2000.0,128.0
-3000,-1600.0,112.0
-3000,-1200.0,96.0
-3000,-900.0,84.0
-3000,-600.0,72.0
-3000,-400.0,64.0
-3000,-200.0,56.0
-3000,0.0,56.0
-3000,200.0,56.0
-3000,400.0,64.0
-3000,600.0,72.0
-3000,900.0,84.0
-3000,1200.0,96.0
-3000,1600.0,112.0
-3000,2000.0,128.0
-3000,2500.0,148.0
-3000,3000.0,168.0
-3000,3500.0,188.0
-3000,4000.0,208.0
-3000,4500.0,228.0
-3000,5000.0,248.0
-3000,5500.0,268.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbat b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbat
deleted file mode 100644
index 54f104616b..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbat
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": "",
-    "Date": "2020-08-24T13:47:26.1945484Z",
-    "AppVersion": "3",
-    "FileVersion": 1
-  },
-  "Body": {
-    "SavedInDeclMode": false,
-    "Model": "Generic Battery",
-    "Capacity": 14.0,
-    "SOC_min": 20.0,
-    "SOC_max": 80.0,
-    "InternalResistanceCurve": "GenericBattery_10kWh_658V.vbatr",
-    "MaxCurrentMap": "MaxCurrent_280.vimax",
-    "SoCCurve": "GenericBattery_10kWh_658V.vbatv"
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatr b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatr
deleted file mode 100644
index 09c936221a..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatr
+++ /dev/null
@@ -1,3 +0,0 @@
-SoC, Ri
-0,  0.12
-100,  0.12
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatv b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatv
deleted file mode 100644
index 8063e04c93..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericBattery_10kWh_658V.vbatv
+++ /dev/null
@@ -1,12 +0,0 @@
-SOC, V
-0, 590 
-10, 614 
-20, 626 
-30, 632 
-40, 638 
-50, 640 
-60, 640 
-70, 642 
-80, 646 
-90, 650 
-100, 658
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericDrag_140kW_936Nm.vemd b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericDrag_140kW_936Nm.vemd
deleted file mode 100644
index 67d7db9f1b..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericDrag_140kW_936Nm.vemd
+++ /dev/null
@@ -1,3 +0,0 @@
-n [rpm] , T_drag [Nm]
-0       , -11.70
-4268.63    , -58.50
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_900Nm.vemp b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_900Nm.vemp
deleted file mode 100644
index dc507a3de8..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_900Nm.vemp
+++ /dev/null
@@ -1,74 +0,0 @@
-n [rpm] , T_drive [Nm] , T_drag [Nm]
-0,900,-900
-1485.446136,900,-900
-1480,900,-900
-1488.888889,897.93,-897.93
-1497.777778,892.5975,-892.5975
-1506.666667,887.3325,-887.3325
-1511.111111,884.7225,-884.7225
-1555.555556,859.4325,-859.4325
-1600,835.56,-835.56
-1644.444444,812.97,-812.97
-1688.888889,791.595,-791.595
-1733.333333,771.3,-771.3
-1777.777778,752.0175,-752.0175
-1822.222222,733.6575,-733.6575
-1866.666667,716.1975,-716.1975
-1911.111111,699.5475,-699.5475
-1955.555556,683.64,-683.64
-2000,668.4525,-668.4525
-2044.444444,653.9175,-653.9175
-2088.888889,640.0125,-640.0125
-2133.333333,626.67,-626.67
-2177.777778,613.89,-613.89
-2222.222222,601.605,-601.605
-2266.666667,589.815,-589.815
-2311.111111,578.475,-578.475
-2355.555556,567.5625,-567.5625
-2400,557.0325,-557.0325
-2444.444444,546.9075,-546.9075
-2488.888889,537.1425,-537.1425
-2533.333333,527.715,-527.715
-2577.777778,518.625,-518.625
-2622.222222,509.8275,-509.8275
-2666.666667,501.345,-501.345
-2711.111111,493.11,-493.11
-2755.555556,485.1675,-485.1675
-2800,477.4725,-477.4725
-2844.444444,470.0025,-470.0025
-2888.888889,462.78,-462.78
-2933.333333,455.76,-455.76
-2977.777778,448.965,-448.965
-3022.222222,442.35,-442.35
-3066.666667,435.9375,-435.9375
-3111.111111,429.7275,-429.7275
-3155.555556,423.675,-423.675
-3200,417.78,-417.78
-3244.444444,412.065,-412.065
-3288.888889,406.485,-406.485
-3333.333333,401.0625,-401.0625
-3377.777778,395.7975,-395.7975
-3422.222222,390.645,-390.645
-3466.666667,385.65,-385.65
-3511.111111,380.7675,-380.7675
-3555.555556,375.9975,-375.9975
-3600,371.3625,-371.3625
-3644.444444,366.84,-366.84
-3688.888889,362.4075,-362.4075
-3733.333333,358.0875,-358.0875
-3777.777778,353.88,-353.88
-3822.222222,349.7625,-349.7625
-3866.666667,345.7575,-345.7575
-3911.111111,341.82,-341.82
-3955.555556,337.9725,-337.9725
-4000,334.215,-334.215
-4044.444444,330.5475,-330.5475
-4088.888889,326.97,-326.97
-4133.333333,323.4375,-323.4375
-4177.777778,319.995,-319.995
-4222.222222,316.6425,-316.6425
-4266.666667,313.335,-313.335
-4311.111111,310.095,-310.095
-4355.555556,306.945,-306.945
-4400,303.84,-303.84
-4444.444444,300.8025,-300.8025
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_936Nm.vem b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_936Nm.vem
deleted file mode 100644
index 0e165bc87b..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericEMotor_140kW_936Nm.vem
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": " ()",
-    "Date": "2016-10-13T08:54:28.7387223Z",
-    "AppVersion": "3",
-    "FileVersion": 1
-  },
-  "Body": {
-    "SavedInDeclMode": false,
-    "Model": "Generic Electric Motor",
-    "FullLoadCurve": "GenericEMotor_140kW_900Nm.vemp",
-    "DragCurve": "GenericDrag_140kW_936Nm.vemd",
-    "EfficiencyMap": "GenericMap_140kW_936Nm.vemo",
-    "Inertia": 0.5,
-    "ContinuousPower": 5000000,
-    "ContinuousPowerSpeed": 2000,
-    "OverloadTime": 30,
-    "ThermalOverloadRecoveryFactor": 0.9
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericMap_140kW_936Nm.vemo
deleted file mode 100644
index aaf978890c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/GenericMap_140kW_936Nm.vemo
+++ /dev/null
@@ -1,2016 +0,0 @@
-n [rpm] , T [Nm] , P_el [kW]
-0,-936,9.8449
-0,-906.75,9.2719
-0,-877.5,8.7161
-0,-848.25,8.1773
-0,-819,7.6558
-0,-789.75,7.1514
-0,-760.5,6.6641
-0,-731.25,6.194
-0,-702,5.741
-0,-672.75,5.3052
-0,-643.5,4.8866
-0,-614.25,4.4851
-0,-585,4.1007
-0,-555.75,3.7335
-0,-526.5,3.3834
-0,-497.25,3.0505
-0,-468,2.7348
-0,-438.75,2.4362
-0,-409.5,2.1547
-0,-380.25,1.8904
-0,-351,1.6433
-0,-321.75,1.4133
-0,-292.5,1.2004
-0,-263.25,1.0047
-0,-234,0.82617
-0,-204.75,0.66478
-0,-175.5,0.52053
-0,-146.25,0.39344
-0,-117,0.28349
-0,-87.75,0.1907
-0,-58.5,0.11506
-0,-29.25,0.056566
-0,0,0.0361
-0,29.25,0.086979
-0,58.5,0.15501
-0,87.75,0.24019
-0,117,0.34252
-0,146.25,0.462
-0,175.5,0.59864
-0,204.75,0.75242
-0,234,0.92335
-0,263.25,1.1114
-0,292.5,1.3167
-0,321.75,1.5391
-0,351,1.7786
-0,380.25,2.0353
-0,409.5,2.3091
-0,438.75,2.6001
-0,468,2.9083
-0,497.25,3.2336
-0,526.5,3.576
-0,555.75,3.9356
-0,585,4.3123
-0,614.25,4.7062
-0,643.5,5.1173
-0,672.75,5.5455
-0,702,5.9908
-0,731.25,6.4533
-0,760.5,6.933
-0,789.75,7.4298
-0,819,7.9437
-0,848.25,8.4748
-0,877.5,9.0231
-0,906.75,9.5885
-0,936,10.171
-40.80854701,-936,5.8367
-40.80854701,-906.75,5.3901
-40.80854701,-877.5,4.9606
-40.80854701,-848.25,4.5482
-40.80854701,-819,4.153
-40.80854701,-789.75,3.775
-40.80854701,-760.5,3.4141
-40.80854701,-731.25,3.0704
-40.80854701,-702,2.7438
-40.80854701,-672.75,2.4344
-40.80854701,-643.5,2.1421
-40.80854701,-614.25,1.8669
-40.80854701,-585,1.609
-40.80854701,-555.75,1.3681
-40.80854701,-526.5,1.1445
-40.80854701,-497.25,0.93793
-40.80854701,-468,0.74855
-40.80854701,-438.75,0.57729
-40.80854701,-409.5,0.4236
-40.80854701,-380.25,0.28766
-40.80854701,-351,0.16853
-40.80854701,-321.75,0.066217
-40.80854701,-292.5,-0.019286
-40.80854701,-263.25,-0.087979
-40.80854701,-234,-0.13986
-40.80854701,-204.75,-0.17493
-40.80854701,-175.5,-0.19319
-40.80854701,-146.25,-0.19464
-40.80854701,-117,-0.17927
-40.80854701,-87.75,-0.1471
-40.80854701,-58.5,-0.09811
-40.80854701,-29.25,-0.032313
-40.80854701,0,0.07245
-40.80854701,29.25,0.24971
-40.80854701,58.5,0.44411
-40.80854701,87.75,0.65567
-40.80854701,117,0.88437
-40.80854701,146.25,1.1302
-40.80854701,175.5,1.3932
-40.80854701,204.75,1.6734
-40.80854701,234,1.9707
-40.80854701,263.25,2.2852
-40.80854701,292.5,2.6168
-40.80854701,321.75,2.9655
-40.80854701,351,3.3315
-40.80854701,380.25,3.7145
-40.80854701,409.5,4.1147
-40.80854701,438.75,4.5321
-40.80854701,468,4.9666
-40.80854701,497.25,5.4183
-40.80854701,526.5,5.8871
-40.80854701,555.75,6.3731
-40.80854701,585,6.8762
-40.80854701,614.25,7.3965
-40.80854701,643.5,7.9339
-40.80854701,672.75,8.4885
-40.80854701,702,9.0602
-40.80854701,731.25,9.6491
-40.80854701,760.5,10.255
-40.80854701,789.75,10.878
-40.80854701,819,11.519
-40.80854701,848.25,12.176
-40.80854701,877.5,12.851
-40.80854701,906.75,13.542
-40.80854701,936,14.251
-81.61794872,-936,1.8303
-81.61794872,-906.75,1.5101
-81.61794872,-877.5,1.2075
-81.61794872,-848.25,0.92457
-81.61794872,-819,0.66034
-81.61794872,-789.75,0.41292
-81.61794872,-760.5,0.18231
-81.61794872,-731.25,-0.031493
-81.61794872,-702,-0.22848
-81.61794872,-672.75,-0.40866
-81.61794872,-643.5,-0.57202
-81.61794872,-614.25,-0.71858
-81.61794872,-585,-0.84832
-81.61794872,-555.75,-0.96125
-81.61794872,-526.5,-1.0574
-81.61794872,-497.25,-1.1367
-81.61794872,-468,-1.1992
-81.61794872,-438.75,-1.2449
-81.61794872,-409.5,-1.2737
-81.61794872,-380.25,-1.2858
-81.61794872,-351,-1.2811
-81.61794872,-321.75,-1.2595
-81.61794872,-292.5,-1.2211
-81.61794872,-263.25,-1.1659
-81.61794872,-234,-1.0939
-81.61794872,-204.75,-1.0051
-81.61794872,-175.5,-0.89953
-81.61794872,-146.25,-0.7771
-81.61794872,-117,-0.63787
-81.61794872,-87.75,-0.48182
-81.61794872,-58.5,-0.30896
-81.61794872,-29.25,-0.11929
-81.61794872,0,0.11065
-81.61794872,29.25,0.41428
-81.61794872,58.5,0.73507
-81.61794872,87.75,1.073
-81.61794872,117,1.4281
-81.61794872,146.25,1.8003
-81.61794872,175.5,2.1897
-81.61794872,204.75,2.5962
-81.61794872,234,3.0199
-81.61794872,263.25,3.4608
-81.61794872,292.5,3.9188
-81.61794872,321.75,4.3939
-81.61794872,351,4.8862
-81.61794872,380.25,5.3956
-81.61794872,409.5,5.9222
-81.61794872,438.75,6.466
-81.61794872,468,7.0269
-81.61794872,497.25,7.6049
-81.61794872,526.5,8.2001
-81.61794872,555.75,8.8124
-81.61794872,585,9.4419
-81.61794872,614.25,10.089
-81.61794872,643.5,10.752
-81.61794872,672.75,11.433
-81.61794872,702,12.131
-81.61794872,731.25,12.847
-81.61794872,760.5,13.579
-81.61794872,789.75,14.329
-81.61794872,819,15.095
-81.61794872,848.25,15.879
-81.61794872,877.5,16.68
-81.61794872,906.75,17.498
-81.61794872,936,18.334
-122.4273504,-936,-2.1071
-122.4273504,-906.75,-2.2979
-122.4273504,-877.5,-2.4719
-122.4273504,-848.25,-2.629
-122.4273504,-819,-2.7694
-122.4273504,-789.75,-2.8929
-122.4273504,-760.5,-2.9997
-122.4273504,-731.25,-3.0896
-122.4273504,-702,-3.1627
-122.4273504,-672.75,-3.219
-122.4273504,-643.5,-3.2585
-122.4273504,-614.25,-3.2812
-122.4273504,-585,-3.2871
-122.4273504,-555.75,-3.2761
-122.4273504,-526.5,-3.2484
-122.4273504,-497.25,-3.2038
-122.4273504,-468,-3.1424
-122.4273504,-438.75,-3.0642
-122.4273504,-409.5,-2.9692
-122.4273504,-380.25,-2.8574
-122.4273504,-351,-2.7288
-122.4273504,-321.75,-2.5834
-122.4273504,-292.5,-2.4211
-122.4273504,-263.25,-2.2421
-122.4273504,-234,-2.0462
-122.4273504,-204.75,-1.8335
-122.4273504,-175.5,-1.604
-122.4273504,-146.25,-1.3577
-122.4273504,-117,-1.0946
-122.4273504,-87.75,-0.81471
-122.4273504,-58.5,-0.51798
-122.4273504,-29.25,-0.20444
-122.4273504,0,0.15072
-122.4273504,29.25,0.58072
-122.4273504,58.5,1.0279
-122.4273504,87.75,1.4922
-122.4273504,117,1.9737
-122.4273504,146.25,2.4723
-122.4273504,175.5,2.988
-122.4273504,204.75,3.5209
-122.4273504,234,4.071
-122.4273504,263.25,4.6382
-122.4273504,292.5,5.2226
-122.4273504,321.75,5.8241
-122.4273504,351,6.4428
-122.4273504,380.25,7.0786
-122.4273504,409.5,7.7315
-122.4273504,438.75,8.4017
-122.4273504,468,9.0889
-122.4273504,497.25,9.7934
-122.4273504,526.5,10.515
-122.4273504,555.75,11.254
-122.4273504,585,12.01
-122.4273504,614.25,12.783
-122.4273504,643.5,13.573
-122.4273504,672.75,14.38
-122.4273504,702,15.205
-122.4273504,731.25,16.046
-122.4273504,760.5,16.905
-122.4273504,789.75,17.781
-122.4273504,819,18.674
-122.4273504,848.25,19.584
-122.4273504,877.5,20.512
-122.4273504,906.75,21.456
-122.4273504,936,22.418
-163.2393162,-936,-6.0305
-163.2393162,-906.75,-6.0974
-163.2393162,-877.5,-6.1475
-163.2393162,-848.25,-6.1808
-163.2393162,-819,-6.1973
-163.2393162,-789.75,-6.197
-163.2393162,-760.5,-6.1799
-163.2393162,-731.25,-6.1459
-163.2393162,-702,-6.0951
-163.2393162,-672.75,-6.0276
-163.2393162,-643.5,-5.9432
-163.2393162,-614.25,-5.842
-163.2393162,-585,-5.724
-163.2393162,-555.75,-5.5892
-163.2393162,-526.5,-5.4376
-163.2393162,-497.25,-5.2691
-163.2393162,-468,-5.0839
-163.2393162,-438.75,-4.8818
-163.2393162,-409.5,-4.6629
-163.2393162,-380.25,-4.4272
-163.2393162,-351,-4.1748
-163.2393162,-321.75,-3.9054
-163.2393162,-292.5,-3.6193
-163.2393162,-263.25,-3.3164
-163.2393162,-234,-2.9967
-163.2393162,-204.75,-2.6601
-163.2393162,-175.5,-2.3067
-163.2393162,-146.25,-1.9366
-163.2393162,-117,-1.5496
-163.2393162,-87.75,-1.1458
-163.2393162,-58.5,-0.72519
-163.2393162,-29.25,-0.28777
-163.2393162,0,0.19264
-163.2393162,29.25,0.74902
-163.2393162,58.5,1.3226
-163.2393162,87.75,1.9132
-163.2393162,117,2.5211
-163.2393162,146.25,3.1461
-163.2393162,175.5,3.7882
-163.2393162,204.75,4.4475
-163.2393162,234,5.1239
-163.2393162,263.25,5.8175
-163.2393162,292.5,6.5283
-163.2393162,321.75,7.2561
-163.2393162,351,8.0012
-163.2393162,380.25,8.7634
-163.2393162,409.5,9.5427
-163.2393162,438.75,10.339
-163.2393162,468,11.153
-163.2393162,497.25,11.984
-163.2393162,526.5,12.832
-163.2393162,555.75,13.697
-163.2393162,585,14.579
-163.2393162,614.25,15.478
-163.2393162,643.5,16.395
-163.2393162,672.75,17.329
-163.2393162,702,18.279
-163.2393162,731.25,19.247
-163.2393162,760.5,20.233
-163.2393162,789.75,21.235
-163.2393162,819,22.254
-163.2393162,848.25,23.291
-163.2393162,877.5,24.345
-163.2393162,906.75,25.416
-163.2393162,936,26.504
-204.042735,-936,-9.9521
-204.042735,-906.75,-9.8951
-204.042735,-877.5,-9.8214
-204.042735,-848.25,-9.7308
-204.042735,-819,-9.6234
-204.042735,-789.75,-9.4992
-204.042735,-760.5,-9.3582
-204.042735,-731.25,-9.2004
-204.042735,-702,-9.0258
-204.042735,-672.75,-8.8343
-204.042735,-643.5,-8.626
-204.042735,-614.25,-8.401
-204.042735,-585,-8.1591
-204.042735,-555.75,-7.9004
-204.042735,-526.5,-7.6249
-204.042735,-497.25,-7.3326
-204.042735,-468,-7.0235
-204.042735,-438.75,-6.6975
-204.042735,-409.5,-6.3548
-204.042735,-380.25,-5.9952
-204.042735,-351,-5.6189
-204.042735,-321.75,-5.2257
-204.042735,-292.5,-4.8157
-204.042735,-263.25,-4.3889
-204.042735,-234,-3.9453
-204.042735,-204.75,-3.4849
-204.042735,-175.5,-3.0076
-204.042735,-146.25,-2.5136
-204.042735,-117,-2.0027
-204.042735,-87.75,-1.475
-204.042735,-58.5,-0.93057
-204.042735,-29.25,-0.36928
-204.042735,0,0.23641
-204.042735,29.25,0.91917
-204.042735,58.5,1.6191
-204.042735,87.75,2.3361
-204.042735,117,3.0704
-204.042735,146.25,3.8217
-204.042735,175.5,4.5902
-204.042735,204.75,5.3759
-204.042735,234,6.1787
-204.042735,263.25,6.9987
-204.042735,292.5,7.8358
-204.042735,321.75,8.6901
-204.042735,351,9.5615
-204.042735,380.25,10.45
-204.042735,409.5,11.356
-204.042735,438.75,12.279
-204.042735,468,13.219
-204.042735,497.25,14.176
-204.042735,526.5,15.15
-204.042735,555.75,16.142
-204.042735,585,17.15
-204.042735,614.25,18.176
-204.042735,643.5,19.219
-204.042735,672.75,20.279
-204.042735,702,21.356
-204.042735,731.25,22.451
-204.042735,760.5,23.562
-204.042735,789.75,24.691
-204.042735,819,25.837
-204.042735,848.25,27
-204.042735,877.5,28.18
-204.042735,906.75,29.377
-204.042735,936,30.592
-244.8547009,-936,-13.872
-244.8547009,-906.75,-13.691
-244.8547009,-877.5,-13.493
-244.8547009,-848.25,-13.279
-244.8547009,-819,-13.048
-244.8547009,-789.75,-12.8
-244.8547009,-760.5,-12.535
-244.8547009,-731.25,-12.253
-244.8547009,-702,-11.955
-244.8547009,-672.75,-11.639
-244.8547009,-643.5,-11.307
-244.8547009,-614.25,-10.958
-244.8547009,-585,-10.592
-244.8547009,-555.75,-10.21
-244.8547009,-526.5,-9.8105
-244.8547009,-497.25,-9.3943
-244.8547009,-468,-8.9613
-244.8547009,-438.75,-8.5115
-244.8547009,-409.5,-8.0448
-244.8547009,-380.25,-7.5614
-244.8547009,-351,-7.0612
-244.8547009,-321.75,-6.5441
-244.8547009,-292.5,-6.0103
-244.8547009,-263.25,-5.4596
-244.8547009,-234,-4.8921
-244.8547009,-204.75,-4.3078
-244.8547009,-175.5,-3.7067
-244.8547009,-146.25,-3.0888
-244.8547009,-117,-2.454
-244.8547009,-87.75,-1.8025
-244.8547009,-58.5,-1.1341
-244.8547009,-29.25,-0.44896
-244.8547009,0,0.28205
-244.8547009,29.25,1.0912
-244.8547009,58.5,1.9175
-244.8547009,87.75,2.7609
-244.8547009,117,3.6215
-244.8547009,146.25,4.4992
-244.8547009,175.5,5.3941
-244.8547009,204.75,6.3062
-244.8547009,234,7.2354
-244.8547009,263.25,8.1817
-244.8547009,292.5,9.1452
-244.8547009,321.75,10.126
-244.8547009,351,11.124
-244.8547009,380.25,12.139
-244.8547009,409.5,13.171
-244.8547009,438.75,14.22
-244.8547009,468,15.286
-244.8547009,497.25,16.37
-244.8547009,526.5,17.471
-244.8547009,555.75,18.588
-244.8547009,585,19.723
-244.8547009,614.25,20.876
-244.8547009,643.5,22.045
-244.8547009,672.75,23.231
-244.8547009,702,24.435
-244.8547009,731.25,25.656
-244.8547009,760.5,26.894
-244.8547009,789.75,28.149
-244.8547009,819,29.421
-244.8547009,848.25,30.71
-244.8547009,877.5,32.017
-244.8547009,906.75,33.34
-244.8547009,936,34.681
-285.6666667,-936,-17.79
-285.6666667,-906.75,-17.485
-285.6666667,-877.5,-17.164
-285.6666667,-848.25,-16.825
-285.6666667,-819,-16.47
-285.6666667,-789.75,-16.098
-285.6666667,-760.5,-15.709
-285.6666667,-731.25,-15.304
-285.6666667,-702,-14.881
-285.6666667,-672.75,-14.442
-285.6666667,-643.5,-13.986
-285.6666667,-614.25,-13.513
-285.6666667,-585,-13.024
-285.6666667,-555.75,-12.517
-285.6666667,-526.5,-11.994
-285.6666667,-497.25,-11.454
-285.6666667,-468,-10.897
-285.6666667,-438.75,-10.324
-285.6666667,-409.5,-9.7331
-285.6666667,-380.25,-9.1258
-285.6666667,-351,-8.5016
-285.6666667,-321.75,-7.8607
-285.6666667,-292.5,-7.203
-285.6666667,-263.25,-6.5284
-285.6666667,-234,-5.8371
-285.6666667,-204.75,-5.1289
-285.6666667,-175.5,-4.4039
-285.6666667,-146.25,-3.6621
-285.6666667,-117,-2.9035
-285.6666667,-87.75,-2.1281
-285.6666667,-58.5,-1.3359
-285.6666667,-29.25,-0.52683
-285.6666667,0,0.32954
-285.6666667,29.25,1.2651
-285.6666667,58.5,2.2177
-285.6666667,87.75,3.1875
-285.6666667,117,4.1745
-285.6666667,146.25,5.1786
-285.6666667,175.5,6.1999
-285.6666667,204.75,7.2383
-285.6666667,234,8.2939
-285.6666667,263.25,9.3666
-285.6666667,292.5,10.456
-285.6666667,321.75,11.563
-285.6666667,351,12.688
-285.6666667,380.25,13.829
-285.6666667,409.5,14.987
-285.6666667,438.75,16.163
-285.6666667,468,17.356
-285.6666667,497.25,18.566
-285.6666667,526.5,19.793
-285.6666667,555.75,21.037
-285.6666667,585,22.298
-285.6666667,614.25,23.577
-285.6666667,643.5,24.873
-285.6666667,672.75,26.185
-285.6666667,702,27.515
-285.6666667,731.25,28.863
-285.6666667,760.5,30.227
-285.6666667,789.75,31.608
-285.6666667,819,33.007
-285.6666667,848.25,34.423
-285.6666667,877.5,35.856
-285.6666667,906.75,37.306
-285.6666667,936,38.773
-326.4700855,-936,-21.706
-326.4700855,-906.75,-21.277
-326.4700855,-877.5,-20.832
-326.4700855,-848.25,-20.37
-326.4700855,-819,-19.891
-326.4700855,-789.75,-19.395
-326.4700855,-760.5,-18.882
-326.4700855,-731.25,-18.353
-326.4700855,-702,-17.807
-326.4700855,-672.75,-17.244
-326.4700855,-643.5,-16.664
-326.4700855,-614.25,-16.067
-326.4700855,-585,-15.454
-326.4700855,-555.75,-14.823
-326.4700855,-526.5,-14.176
-326.4700855,-497.25,-13.512
-326.4700855,-468,-12.831
-326.4700855,-438.75,-12.134
-326.4700855,-409.5,-11.419
-326.4700855,-380.25,-10.688
-326.4700855,-351,-9.9403
-326.4700855,-321.75,-9.1755
-326.4700855,-292.5,-8.3939
-326.4700855,-263.25,-7.5955
-326.4700855,-234,-6.7802
-326.4700855,-204.75,-5.9482
-326.4700855,-175.5,-5.0993
-326.4700855,-146.25,-4.2337
-326.4700855,-117,-3.3512
-326.4700855,-87.75,-2.4519
-326.4700855,-58.5,-1.5358
-326.4700855,-29.25,-0.60288
-326.4700855,0,0.37889
-326.4700855,29.25,1.4408
-326.4700855,58.5,2.5198
-326.4700855,87.75,3.616
-326.4700855,117,4.7293
-326.4700855,146.25,5.8598
-326.4700855,175.5,7.0075
-326.4700855,204.75,8.1723
-326.4700855,234,9.3542
-326.4700855,263.25,10.553
-326.4700855,292.5,11.77
-326.4700855,321.75,13.003
-326.4700855,351,14.254
-326.4700855,380.25,15.521
-326.4700855,409.5,16.806
-326.4700855,438.75,18.108
-326.4700855,468,19.427
-326.4700855,497.25,20.764
-326.4700855,526.5,22.117
-326.4700855,555.75,23.488
-326.4700855,585,24.875
-326.4700855,614.25,26.28
-326.4700855,643.5,27.702
-326.4700855,672.75,29.141
-326.4700855,702,30.598
-326.4700855,731.25,32.071
-326.4700855,760.5,33.562
-326.4700855,789.75,35.07
-326.4700855,819,36.595
-326.4700855,848.25,38.137
-326.4700855,877.5,39.696
-326.4700855,906.75,41.273
-326.4700855,936,42.866
-367.2820513,-936,-25.62
-367.2820513,-906.75,-25.068
-367.2820513,-877.5,-24.499
-367.2820513,-848.25,-23.912
-367.2820513,-819,-23.31
-367.2820513,-789.75,-22.69
-367.2820513,-760.5,-22.053
-367.2820513,-731.25,-21.4
-367.2820513,-702,-20.73
-367.2820513,-672.75,-20.043
-367.2820513,-643.5,-19.339
-367.2820513,-614.25,-18.619
-367.2820513,-585,-17.881
-367.2820513,-555.75,-17.127
-367.2820513,-526.5,-16.356
-367.2820513,-497.25,-15.568
-367.2820513,-468,-14.764
-367.2820513,-438.75,-13.942
-367.2820513,-409.5,-13.104
-367.2820513,-380.25,-12.249
-367.2820513,-351,-11.377
-367.2820513,-321.75,-10.488
-367.2820513,-292.5,-9.583
-367.2820513,-263.25,-8.6607
-367.2820513,-234,-7.7216
-367.2820513,-204.75,-6.7657
-367.2820513,-175.5,-5.7929
-367.2820513,-146.25,-4.8034
-367.2820513,-117,-3.797
-367.2820513,-87.75,-2.7739
-367.2820513,-58.5,-1.7339
-367.2820513,-29.25,-0.67711
-367.2820513,0,0.4301
-367.2820513,29.25,1.6184
-367.2820513,58.5,2.8238
-367.2820513,87.75,4.0463
-367.2820513,117,5.2861
-367.2820513,146.25,6.5429
-367.2820513,175.5,7.8169
-367.2820513,204.75,9.1081
-367.2820513,234,10.416
-367.2820513,263.25,11.742
-367.2820513,292.5,13.085
-367.2820513,321.75,14.444
-367.2820513,351,15.821
-367.2820513,380.25,17.215
-367.2820513,409.5,18.627
-367.2820513,438.75,20.055
-367.2820513,468,21.5
-367.2820513,497.25,22.963
-367.2820513,526.5,24.443
-367.2820513,555.75,25.94
-367.2820513,585,27.454
-367.2820513,614.25,28.985
-367.2820513,643.5,30.534
-367.2820513,672.75,32.099
-367.2820513,702,33.682
-367.2820513,731.25,35.282
-367.2820513,760.5,36.899
-367.2820513,789.75,38.533
-367.2820513,819,40.185
-367.2820513,848.25,41.853
-367.2820513,877.5,43.539
-367.2820513,906.75,45.241
-367.2820513,936,46.961
-408.0854701,-936,-29.533
-408.0854701,-906.75,-28.856
-408.0854701,-877.5,-28.163
-408.0854701,-848.25,-27.453
-408.0854701,-819,-26.727
-408.0854701,-789.75,-25.983
-408.0854701,-760.5,-25.223
-408.0854701,-731.25,-24.445
-408.0854701,-702,-23.651
-408.0854701,-672.75,-22.841
-408.0854701,-643.5,-22.013
-408.0854701,-614.25,-21.169
-408.0854701,-585,-20.307
-408.0854701,-555.75,-19.429
-408.0854701,-526.5,-18.534
-408.0854701,-497.25,-17.623
-408.0854701,-468,-16.694
-408.0854701,-438.75,-15.749
-408.0854701,-409.5,-14.787
-408.0854701,-380.25,-13.808
-408.0854701,-351,-12.812
-408.0854701,-321.75,-11.8
-408.0854701,-292.5,-10.77
-408.0854701,-263.25,-9.7241
-408.0854701,-234,-8.6611
-408.0854701,-204.75,-7.5813
-408.0854701,-175.5,-6.4847
-408.0854701,-146.25,-5.3713
-408.0854701,-117,-4.2411
-408.0854701,-87.75,-3.094
-408.0854701,-58.5,-1.9302
-408.0854701,-29.25,-0.74951
-408.0854701,0,0.48317
-408.0854701,29.25,1.7978
-408.0854701,58.5,3.1296
-408.0854701,87.75,4.4785
-408.0854701,117,5.8446
-408.0854701,146.25,7.2279
-408.0854701,175.5,8.6283
-408.0854701,204.75,10.046
-408.0854701,234,11.481
-408.0854701,263.25,12.932
-408.0854701,292.5,14.401
-408.0854701,321.75,15.888
-408.0854701,351,17.391
-408.0854701,380.25,18.911
-408.0854701,409.5,20.449
-408.0854701,438.75,22.004
-408.0854701,468,23.576
-408.0854701,497.25,25.165
-408.0854701,526.5,26.771
-408.0854701,555.75,28.394
-408.0854701,585,30.035
-408.0854701,614.25,31.692
-408.0854701,643.5,33.367
-408.0854701,672.75,35.059
-408.0854701,702,36.768
-408.0854701,731.25,38.494
-408.0854701,760.5,40.238
-408.0854701,789.75,41.998
-408.0854701,819,43.776
-408.0854701,848.25,45.571
-408.0854701,877.5,47.383
-408.0854701,906.75,49.212
-408.0854701,936,51.058
-448.8974359,-936,-33.443
-448.8974359,-906.75,-32.643
-448.8974359,-877.5,-31.826
-448.8974359,-848.25,-30.992
-448.8974359,-819,-30.142
-448.8974359,-789.75,-29.274
-448.8974359,-760.5,-28.39
-448.8974359,-731.25,-27.489
-448.8974359,-702,-26.571
-448.8974359,-672.75,-25.636
-448.8974359,-643.5,-24.685
-448.8974359,-614.25,-23.717
-448.8974359,-585,-22.732
-448.8974359,-555.75,-21.73
-448.8974359,-526.5,-20.711
-448.8974359,-497.25,-19.675
-448.8974359,-468,-18.623
-448.8974359,-438.75,-17.554
-448.8974359,-409.5,-16.468
-448.8974359,-380.25,-15.365
-448.8974359,-351,-14.245
-448.8974359,-321.75,-13.109
-448.8974359,-292.5,-11.956
-448.8974359,-263.25,-10.786
-448.8974359,-234,-9.5988
-448.8974359,-204.75,-8.3951
-448.8974359,-175.5,-7.1747
-448.8974359,-146.25,-5.9374
-448.8974359,-117,-4.6833
-448.8974359,-87.75,-3.4124
-448.8974359,-58.5,-2.1246
-448.8974359,-29.25,-0.82009
-448.8974359,0,0.53809
-448.8974359,29.25,1.9791
-448.8974359,58.5,3.4373
-448.8974359,87.75,4.9126
-448.8974359,117,6.4051
-448.8974359,146.25,7.9147
-448.8974359,175.5,9.4414
-448.8974359,204.75,10.985
-448.8974359,234,12.546
-448.8974359,263.25,14.125
-448.8974359,292.5,15.72
-448.8974359,321.75,17.333
-448.8974359,351,18.962
-448.8974359,380.25,20.609
-448.8974359,409.5,22.273
-448.8974359,438.75,23.954
-448.8974359,468,25.652
-448.8974359,497.25,27.368
-448.8974359,526.5,29.1
-448.8974359,555.75,30.85
-448.8974359,585,32.617
-448.8974359,614.25,34.401
-448.8974359,643.5,36.202
-448.8974359,672.75,38.021
-448.8974359,702,39.856
-448.8974359,731.25,41.709
-448.8974359,760.5,43.579
-448.8974359,789.75,45.465
-448.8974359,819,47.37
-448.8974359,848.25,49.291
-448.8974359,877.5,51.229
-448.8974359,906.75,53.185
-448.8974359,936,55.157
-489.7094017,-936,-37.352
-489.7094017,-906.75,-36.428
-489.7094017,-877.5,-35.487
-489.7094017,-848.25,-34.53
-489.7094017,-819,-33.555
-489.7094017,-789.75,-32.564
-489.7094017,-760.5,-31.556
-489.7094017,-731.25,-30.531
-489.7094017,-702,-29.489
-489.7094017,-672.75,-28.43
-489.7094017,-643.5,-27.355
-489.7094017,-614.25,-26.263
-489.7094017,-585,-25.154
-489.7094017,-555.75,-24.028
-489.7094017,-526.5,-22.885
-489.7094017,-497.25,-21.726
-489.7094017,-468,-20.55
-489.7094017,-438.75,-19.357
-489.7094017,-409.5,-18.147
-489.7094017,-380.25,-16.92
-489.7094017,-351,-15.677
-489.7094017,-321.75,-14.416
-489.7094017,-292.5,-13.139
-489.7094017,-263.25,-11.845
-489.7094017,-234,-10.535
-489.7094017,-204.75,-9.2071
-489.7094017,-175.5,-7.8628
-489.7094017,-146.25,-6.5016
-489.7094017,-117,-5.1236
-489.7094017,-87.75,-3.7289
-489.7094017,-58.5,-2.3173
-489.7094017,-29.25,-0.88886
-489.7094017,0,0.59487
-489.7094017,29.25,2.1623
-489.7094017,58.5,3.7468
-489.7094017,87.75,5.3485
-489.7094017,117,6.9673
-489.7094017,146.25,8.6033
-489.7094017,175.5,10.256
-489.7094017,204.75,11.927
-489.7094017,234,13.614
-489.7094017,263.25,15.319
-489.7094017,292.5,17.041
-489.7094017,321.75,18.779
-489.7094017,351,20.536
-489.7094017,380.25,22.309
-489.7094017,409.5,24.099
-489.7094017,438.75,25.907
-489.7094017,468,27.731
-489.7094017,497.25,29.573
-489.7094017,526.5,31.432
-489.7094017,555.75,33.308
-489.7094017,585,35.201
-489.7094017,614.25,37.112
-489.7094017,643.5,39.039
-489.7094017,672.75,40.984
-489.7094017,702,42.946
-489.7094017,731.25,44.925
-489.7094017,760.5,46.921
-489.7094017,789.75,48.934
-489.7094017,819,50.965
-489.7094017,848.25,53.012
-489.7094017,877.5,55.077
-489.7094017,906.75,57.159
-489.7094017,936,59.258
-816.1794872,-936,-68.557
-816.1794872,-906.75,-66.642
-816.1794872,-877.5,-64.711
-816.1794872,-848.25,-62.762
-816.1794872,-819,-60.796
-816.1794872,-789.75,-58.814
-816.1794872,-760.5,-56.815
-816.1794872,-731.25,-54.799
-816.1794872,-702,-52.766
-816.1794872,-672.75,-50.717
-816.1794872,-643.5,-48.65
-816.1794872,-614.25,-46.567
-816.1794872,-585,-44.467
-816.1794872,-555.75,-42.35
-816.1794872,-526.5,-40.217
-816.1794872,-497.25,-38.066
-816.1794872,-468,-35.899
-816.1794872,-438.75,-33.715
-816.1794872,-409.5,-31.514
-816.1794872,-380.25,-29.297
-816.1794872,-351,-27.062
-816.1794872,-321.75,-24.811
-816.1794872,-292.5,-22.543
-816.1794872,-263.25,-20.258
-816.1794872,-234,-17.956
-816.1794872,-204.75,-15.638
-816.1794872,-175.5,-13.302
-816.1794872,-146.25,-10.95
-816.1794872,-117,-8.5812
-816.1794872,-87.75,-6.1954
-816.1794872,-58.5,-3.7928
-816.1794872,-29.25,-1.3734
-816.1794872,0,1.116
-816.1794872,29.25,3.6944
-816.1794872,58.5,6.29
-816.1794872,87.75,8.9027
-816.1794872,117,11.533
-816.1794872,146.25,14.18
-816.1794872,175.5,16.844
-816.1794872,204.75,19.525
-816.1794872,234,22.223
-816.1794872,263.25,24.939
-816.1794872,292.5,27.672
-816.1794872,321.75,30.422
-816.1794872,351,33.189
-816.1794872,380.25,35.973
-816.1794872,409.5,38.774
-816.1794872,438.75,41.593
-816.1794872,468,44.429
-816.1794872,497.25,47.281
-816.1794872,526.5,50.151
-816.1794872,555.75,53.038
-816.1794872,585,55.943
-816.1794872,614.25,58.864
-816.1794872,643.5,61.803
-816.1794872,672.75,64.758
-816.1794872,702,67.731
-816.1794872,731.25,70.721
-816.1794872,760.5,73.728
-816.1794872,789.75,76.753
-816.1794872,819,79.794
-816.1794872,848.25,82.853
-816.1794872,877.5,85.929
-816.1794872,906.75,89.022
-816.1794872,936,92.132
-1020.25641,-936,-88.002
-1020.25641,-906.75,-85.467
-1020.25641,-877.5,-82.916
-1020.25641,-848.25,-80.348
-1020.25641,-819,-77.763
-1020.25641,-789.75,-75.161
-1020.25641,-760.5,-72.543
-1020.25641,-731.25,-69.908
-1020.25641,-702,-67.255
-1020.25641,-672.75,-64.586
-1020.25641,-643.5,-61.901
-1020.25641,-614.25,-59.198
-1020.25641,-585,-56.479
-1020.25641,-555.75,-53.743
-1020.25641,-526.5,-50.99
-1020.25641,-497.25,-48.22
-1020.25641,-468,-45.433
-1020.25641,-438.75,-42.63
-1020.25641,-409.5,-39.81
-1020.25641,-380.25,-36.973
-1020.25641,-351,-34.119
-1020.25641,-321.75,-31.248
-1020.25641,-292.5,-28.361
-1020.25641,-263.25,-25.456
-1020.25641,-234,-22.535
-1020.25641,-204.75,-19.597
-1020.25641,-175.5,-16.643
-1020.25641,-146.25,-13.671
-1020.25641,-117,-10.683
-1020.25641,-87.75,-7.6778
-1020.25641,-58.5,-4.6558
-1020.25641,-29.25,-1.6171
-1020.25641,0,1.5021
-1020.25641,29.25,4.7124
-1020.25641,58.5,7.9398
-1020.25641,87.75,11.184
-1020.25641,117,14.446
-1020.25641,146.25,17.725
-1020.25641,175.5,21.021
-1020.25641,204.75,24.334
-1020.25641,234,27.665
-1020.25641,263.25,31.012
-1020.25641,292.5,34.377
-1020.25641,321.75,37.758
-1020.25641,351,41.157
-1020.25641,380.25,44.574
-1020.25641,409.5,48.007
-1020.25641,438.75,51.457
-1020.25641,468,54.925
-1020.25641,497.25,58.409
-1020.25641,526.5,61.911
-1020.25641,555.75,65.43
-1020.25641,585,68.966
-1020.25641,614.25,72.52
-1020.25641,643.5,76.09
-1020.25641,672.75,79.678
-1020.25641,702,83.282
-1020.25641,731.25,86.904
-1020.25641,760.5,90.543
-1020.25641,789.75,94.2
-1020.25641,819,97.873
-1020.25641,848.25,101.56
-1020.25641,877.5,105.27
-1020.25641,906.75,109
-1020.25641,936,112.74
-1224.273504,-936,-107.4
-1224.273504,-906.75,-104.25
-1224.273504,-877.5,-101.08
-1224.273504,-848.25,-97.888
-1224.273504,-819,-94.684
-1224.273504,-789.75,-91.463
-1224.273504,-760.5,-88.225
-1224.273504,-731.25,-84.97
-1224.273504,-702,-81.699
-1224.273504,-672.75,-78.411
-1224.273504,-643.5,-75.106
-1224.273504,-614.25,-71.784
-1224.273504,-585,-68.445
-1224.273504,-555.75,-65.089
-1224.273504,-526.5,-61.717
-1224.273504,-497.25,-58.328
-1224.273504,-468,-54.922
-1224.273504,-438.75,-51.499
-1224.273504,-409.5,-48.06
-1224.273504,-380.25,-44.603
-1224.273504,-351,-41.13
-1224.273504,-321.75,-37.64
-1224.273504,-292.5,-34.133
-1224.273504,-263.25,-30.61
-1224.273504,-234,-27.069
-1224.273504,-204.75,-23.512
-1224.273504,-175.5,-19.938
-1224.273504,-146.25,-16.347
-1224.273504,-117,-12.739
-1224.273504,-87.75,-9.1147
-1224.273504,-58.5,-5.4734
-1224.273504,-29.25,-1.8152
-1224.273504,0,1.9346
-1224.273504,29.25,5.7768
-1224.273504,58.5,9.6361
-1224.273504,87.75,13.513
-1224.273504,117,17.406
-1224.273504,146.25,21.317
-1224.273504,175.5,25.245
-1224.273504,204.75,29.19
-1224.273504,234,33.152
-1224.273504,263.25,37.131
-1224.273504,292.5,41.128
-1224.273504,321.75,45.142
-1224.273504,351,49.173
-1224.273504,380.25,53.22
-1224.273504,409.5,57.286
-1224.273504,438.75,61.368
-1224.273504,468,65.467
-1224.273504,497.25,69.584
-1224.273504,526.5,73.718
-1224.273504,555.75,77.868
-1224.273504,585,82.037
-1224.273504,614.25,86.222
-1224.273504,643.5,90.424
-1224.273504,672.75,94.644
-1224.273504,702,98.88
-1224.273504,731.25,103.13
-1224.273504,760.5,107.4
-1224.273504,789.75,111.69
-1224.273504,819,116
-1224.273504,848.25,120.32
-1224.273504,877.5,124.66
-1224.273504,906.75,129.02
-1224.273504,936,133.39
-1428.290598,-936,-126.75
-1428.290598,-906.75,-122.98
-1428.290598,-877.5,-119.19
-1428.290598,-848.25,-115.38
-1428.290598,-819,-111.56
-1428.290598,-789.75,-107.72
-1428.290598,-760.5,-103.86
-1428.290598,-731.25,-99.988
-1428.290598,-702,-96.097
-1428.290598,-672.75,-92.189
-1428.290598,-643.5,-88.265
-1428.290598,-614.25,-84.324
-1428.290598,-585,-80.366
-1428.290598,-555.75,-76.391
-1428.290598,-526.5,-72.399
-1428.290598,-497.25,-68.391
-1428.290598,-468,-64.365
-1428.290598,-438.75,-60.323
-1428.290598,-409.5,-56.264
-1428.290598,-380.25,-52.188
-1428.290598,-351,-48.096
-1428.290598,-321.75,-43.986
-1428.290598,-292.5,-39.86
-1428.290598,-263.25,-35.717
-1428.290598,-234,-31.557
-1428.290598,-204.75,-27.381
-1428.290598,-175.5,-23.187
-1428.290598,-146.25,-18.977
-1428.290598,-117,-14.75
-1428.290598,-87.75,-10.506
-1428.290598,-58.5,-6.2453
-1428.290598,-29.25,-1.9678
-1428.290598,0,2.4136
-1428.290598,29.25,6.8876
-1428.290598,58.5,11.379
-1428.290598,87.75,15.887
-1428.290598,117,20.413
-1428.290598,146.25,24.955
-1428.290598,175.5,29.515
-1428.290598,204.75,34.092
-1428.290598,234,38.686
-1428.290598,263.25,43.297
-1428.290598,292.5,47.926
-1428.290598,321.75,52.571
-1428.290598,351,57.234
-1428.290598,380.25,61.914
-1428.290598,409.5,66.611
-1428.290598,438.75,71.325
-1428.290598,468,76.056
-1428.290598,497.25,80.805
-1428.290598,526.5,85.57
-1428.290598,555.75,90.353
-1428.290598,585,95.153
-1428.290598,614.25,99.97
-1428.290598,643.5,104.8
-1428.290598,672.75,109.66
-1428.290598,702,114.52
-1428.290598,731.25,119.41
-1428.290598,760.5,124.31
-1428.290598,789.75,129.23
-1428.290598,819,134.17
-1428.290598,848.25,139.12
-1428.290598,877.5,144.1
-1428.290598,906.75,149.08
-1428.290598,936,154.09
-1632.393162,-936,-146.06
-1632.393162,-906.75,-141.67
-1632.393162,-877.5,-137.26
-1632.393162,-848.25,-132.83
-1632.393162,-819,-128.39
-1632.393162,-789.75,-123.93
-1632.393162,-760.5,-119.45
-1632.393162,-731.25,-114.96
-1632.393162,-702,-110.45
-1632.393162,-672.75,-105.92
-1632.393162,-643.5,-101.38
-1632.393162,-614.25,-96.818
-1632.393162,-585,-92.241
-1632.393162,-555.75,-87.646
-1632.393162,-526.5,-83.035
-1632.393162,-497.25,-78.407
-1632.393162,-468,-73.763
-1632.393162,-438.75,-69.101
-1632.393162,-409.5,-64.423
-1632.393162,-380.25,-59.728
-1632.393162,-351,-55.016
-1632.393162,-321.75,-50.287
-1632.393162,-292.5,-45.542
-1632.393162,-263.25,-40.779
-1632.393162,-234,-36
-1632.393162,-204.75,-31.204
-1632.393162,-175.5,-26.391
-1632.393162,-146.25,-21.562
-1632.393162,-117,-16.715
-1632.393162,-87.75,-11.852
-1632.393162,-58.5,-6.9718
-1632.393162,-29.25,-2.0749
-1632.393162,0,2.939
-1632.393162,29.25,8.0449
-1632.393162,58.5,13.168
-1632.393162,87.75,18.308
-1632.393162,117,23.466
-1632.393162,146.25,28.64
-1632.393162,175.5,33.832
-1632.393162,204.75,39.041
-1632.393162,234,44.267
-1632.393162,263.25,49.51
-1632.393162,292.5,54.77
-1632.393162,321.75,60.047
-1632.393162,351,65.342
-1632.393162,380.25,70.654
-1632.393162,409.5,75.983
-1632.393162,438.75,81.329
-1632.393162,468,86.692
-1632.393162,497.25,92.072
-1632.393162,526.5,97.47
-1632.393162,555.75,102.88
-1632.393162,585,108.32
-1632.393162,614.25,113.77
-1632.393162,643.5,119.23
-1632.393162,672.75,124.71
-1632.393162,702,130.21
-1632.393162,731.25,135.73
-1632.393162,760.5,141.27
-1632.393162,789.75,146.82
-1632.393162,819,152.39
-1632.393162,848.25,157.97
-1632.393162,877.5,163.58
-1632.393162,906.75,169.2
-1632.393162,936,174.84
-1836.410256,-936,-165.32
-1836.410256,-906.75,-160.31
-1836.410256,-877.5,-155.28
-1836.410256,-848.25,-150.24
-1836.410256,-819,-145.17
-1836.410256,-789.75,-140.1
-1836.410256,-760.5,-135
-1836.410256,-731.25,-129.89
-1836.410256,-702,-124.76
-1836.410256,-672.75,-119.61
-1836.410256,-643.5,-114.45
-1836.410256,-614.25,-109.27
-1836.410256,-585,-104.07
-1836.410256,-555.75,-98.857
-1836.410256,-526.5,-93.626
-1836.410256,-497.25,-88.379
-1836.410256,-468,-83.115
-1836.410256,-438.75,-77.834
-1836.410256,-409.5,-72.536
-1836.410256,-380.25,-67.222
-1836.410256,-351,-61.891
-1836.410256,-321.75,-56.542
-1836.410256,-292.5,-51.177
-1836.410256,-263.25,-45.796
-1836.410256,-234,-40.397
-1836.410256,-204.75,-34.982
-1836.410256,-175.5,-29.55
-1836.410256,-146.25,-24.101
-1836.410256,-117,-18.635
-1836.410256,-87.75,-13.152
-1836.410256,-58.5,-7.6528
-1836.410256,-29.25,-2.1365
-1836.410256,0,3.5108
-1836.410256,29.25,9.2486
-1836.410256,58.5,15.004
-1836.410256,87.75,20.776
-1836.410256,117,26.565
-1836.410256,146.25,32.371
-1836.410256,175.5,38.195
-1836.410256,204.75,44.036
-1836.410256,234,49.893
-1836.410256,263.25,55.768
-1836.410256,292.5,61.661
-1836.410256,321.75,67.57
-1836.410256,351,73.496
-1836.410256,380.25,79.44
-1836.410256,409.5,85.401
-1836.410256,438.75,91.379
-1836.410256,468,97.374
-1836.410256,497.25,103.39
-1836.410256,526.5,109.42
-1836.410256,555.75,115.46
-1836.410256,585,121.53
-1836.410256,614.25,127.61
-1836.410256,643.5,133.7
-1836.410256,672.75,139.82
-1836.410256,702,145.95
-1836.410256,731.25,152.1
-1836.410256,760.5,158.27
-1836.410256,789.75,164.45
-1836.410256,819,170.65
-1836.410256,848.25,176.87
-1836.410256,877.5,183.11
-1836.410256,906.75,189.36
-1836.410256,936,195.63
-2040.42735,-936,-184.54
-2040.42735,-906.75,-178.91
-2040.42735,-877.5,-173.26
-2040.42735,-848.25,-167.59
-2040.42735,-819,-161.91
-2040.42735,-789.75,-156.21
-2040.42735,-760.5,-150.5
-2040.42735,-731.25,-144.77
-2040.42735,-702,-139.02
-2040.42735,-672.75,-133.25
-2040.42735,-643.5,-127.47
-2040.42735,-614.25,-121.67
-2040.42735,-585,-115.85
-2040.42735,-555.75,-110.02
-2040.42735,-526.5,-104.17
-2040.42735,-497.25,-98.305
-2040.42735,-468,-92.421
-2040.42735,-438.75,-86.521
-2040.42735,-409.5,-80.604
-2040.42735,-380.25,-74.67
-2040.42735,-351,-68.72
-2040.42735,-321.75,-62.752
-2040.42735,-292.5,-56.768
-2040.42735,-263.25,-50.767
-2040.42735,-234,-44.749
-2040.42735,-204.75,-38.714
-2040.42735,-175.5,-32.662
-2040.42735,-146.25,-26.594
-2040.42735,-117,-20.509
-2040.42735,-87.75,-14.407
-2040.42735,-58.5,-8.2882
-2040.42735,-29.25,-2.1526
-2040.42735,0,4.1291
-2040.42735,29.25,10.499
-2040.42735,58.5,16.886
-2040.42735,87.75,23.29
-2040.42735,117,29.711
-2040.42735,146.25,36.149
-2040.42735,175.5,42.604
-2040.42735,204.75,49.077
-2040.42735,234,55.567
-2040.42735,263.25,62.074
-2040.42735,292.5,68.598
-2040.42735,321.75,75.139
-2040.42735,351,81.697
-2040.42735,380.25,88.273
-2040.42735,409.5,94.865
-2040.42735,438.75,101.48
-2040.42735,468,108.1
-2040.42735,497.25,114.75
-2040.42735,526.5,121.41
-2040.42735,555.75,128.09
-2040.42735,585,134.78
-2040.42735,614.25,141.49
-2040.42735,643.5,148.22
-2040.42735,672.75,154.97
-2040.42735,702,161.74
-2040.42735,731.25,168.52
-2040.42735,760.5,175.31
-2040.42735,789.75,182.13
-2040.42735,819,188.96
-2040.42735,848.25,195.81
-2040.42735,877.5,202.68
-2040.42735,906.75,209.56
-2040.42735,936,216.47
-2244.529915,-936,-203.71
-2244.529915,-906.75,-197.46
-2244.529915,-877.5,-191.19
-2244.529915,-848.25,-184.91
-2244.529915,-819,-178.61
-2244.529915,-789.75,-172.29
-2244.529915,-760.5,-165.95
-2244.529915,-731.25,-159.6
-2244.529915,-702,-153.23
-2244.529915,-672.75,-146.85
-2244.529915,-643.5,-140.45
-2244.529915,-614.25,-134.03
-2244.529915,-585,-127.59
-2244.529915,-555.75,-121.14
-2244.529915,-526.5,-114.67
-2244.529915,-497.25,-108.19
-2244.529915,-468,-101.68
-2244.529915,-438.75,-95.163
-2244.529915,-409.5,-88.626
-2244.529915,-380.25,-82.073
-2244.529915,-351,-75.503
-2244.529915,-321.75,-68.916
-2244.529915,-292.5,-62.313
-2244.529915,-263.25,-55.692
-2244.529915,-234,-49.055
-2244.529915,-204.75,-42.401
-2244.529915,-175.5,-35.73
-2244.529915,-146.25,-29.042
-2244.529915,-117,-22.338
-2244.529915,-87.75,-15.616
-2244.529915,-58.5,-8.8781
-2244.529915,-29.25,-2.1231
-2244.529915,0,4.7938
-2244.529915,29.25,11.795
-2244.529915,58.5,18.814
-2244.529915,87.75,25.85
-2244.529915,117,32.903
-2244.529915,146.25,39.973
-2244.529915,175.5,47.06
-2244.529915,204.75,54.165
-2244.529915,234,61.287
-2244.529915,263.25,68.425
-2244.529915,292.5,75.581
-2244.529915,321.75,82.754
-2244.529915,351,89.945
-2244.529915,380.25,97.152
-2244.529915,409.5,104.38
-2244.529915,438.75,111.62
-2244.529915,468,118.88
-2244.529915,497.25,126.15
-2244.529915,526.5,133.45
-2244.529915,555.75,140.76
-2244.529915,585,148.08
-2244.529915,614.25,155.43
-2244.529915,643.5,162.79
-2244.529915,672.75,170.17
-2244.529915,702,177.57
-2244.529915,731.25,184.98
-2244.529915,760.5,192.41
-2244.529915,789.75,199.86
-2244.529915,819,207.32
-2244.529915,848.25,214.8
-2244.529915,877.5,222.3
-2244.529915,906.75,229.82
-2244.529915,936,237.35
-2448.547009,-936,-222.84
-2448.547009,-906.75,-215.97
-2448.547009,-877.5,-209.08
-2448.547009,-848.25,-202.18
-2448.547009,-819,-195.25
-2448.547009,-789.75,-188.32
-2448.547009,-760.5,-181.36
-2448.547009,-731.25,-174.39
-2448.547009,-702,-167.4
-2448.547009,-672.75,-160.4
-2448.547009,-643.5,-153.38
-2448.547009,-614.25,-146.34
-2448.547009,-585,-139.29
-2448.547009,-555.75,-132.21
-2448.547009,-526.5,-125.13
-2448.547009,-497.25,-118.02
-2448.547009,-468,-110.9
-2448.547009,-438.75,-103.76
-2448.547009,-409.5,-96.603
-2448.547009,-380.25,-89.431
-2448.547009,-351,-82.241
-2448.547009,-321.75,-75.035
-2448.547009,-292.5,-67.812
-2448.547009,-263.25,-60.572
-2448.547009,-234,-53.315
-2448.547009,-204.75,-46.042
-2448.547009,-175.5,-38.752
-2448.547009,-146.25,-31.445
-2448.547009,-117,-24.121
-2448.547009,-87.75,-16.78
-2448.547009,-58.5,-9.4225
-2448.547009,-29.25,-2.0481
-2448.547009,0,5.505
-2448.547009,29.25,13.138
-2448.547009,58.5,20.789
-2448.547009,87.75,28.457
-2448.547009,117,36.142
-2448.547009,146.25,43.844
-2448.547009,175.5,51.563
-2448.547009,204.75,59.299
-2448.547009,234,67.053
-2448.547009,263.25,74.823
-2448.547009,292.5,82.611
-2448.547009,321.75,90.416
-2448.547009,351,98.238
-2448.547009,380.25,106.08
-2448.547009,409.5,113.93
-2448.547009,438.75,121.81
-2448.547009,468,129.7
-2448.547009,497.25,137.61
-2448.547009,526.5,145.53
-2448.547009,555.75,153.47
-2448.547009,585,161.43
-2448.547009,614.25,169.41
-2448.547009,643.5,177.4
-2448.547009,672.75,185.41
-2448.547009,702,193.44
-2448.547009,731.25,201.49
-2448.547009,760.5,209.55
-2448.547009,789.75,217.63
-2448.547009,819,225.72
-2448.547009,848.25,233.84
-2448.547009,877.5,241.97
-2448.547009,906.75,250.12
-2448.547009,936,258.28
-2652.564103,-936,-241.92
-2652.564103,-906.75,-234.43
-2652.564103,-877.5,-226.92
-2652.564103,-848.25,-219.4
-2652.564103,-819,-211.86
-2652.564103,-789.75,-204.3
-2652.564103,-760.5,-196.73
-2652.564103,-731.25,-189.14
-2652.564103,-702,-181.53
-2652.564103,-672.75,-173.91
-2652.564103,-643.5,-166.27
-2652.564103,-614.25,-158.61
-2652.564103,-585,-150.93
-2652.564103,-555.75,-143.24
-2652.564103,-526.5,-135.53
-2652.564103,-497.25,-127.81
-2652.564103,-468,-120.07
-2652.564103,-438.75,-112.31
-2652.564103,-409.5,-104.53
-2652.564103,-380.25,-96.743
-2652.564103,-351,-88.934
-2652.564103,-321.75,-81.108
-2652.564103,-292.5,-73.266
-2652.564103,-263.25,-65.407
-2652.564103,-234,-57.531
-2652.564103,-204.75,-49.638
-2652.564103,-175.5,-41.728
-2652.564103,-146.25,-33.802
-2652.564103,-117,-25.858
-2652.564103,-87.75,-17.898
-2652.564103,-58.5,-9.9213
-2652.564103,-29.25,-1.9276
-2652.564103,0,6.2626
-2652.564103,29.25,14.528
-2652.564103,58.5,22.81
-2652.564103,87.75,31.11
-2652.564103,117,39.427
-2652.564103,146.25,47.761
-2652.564103,175.5,56.112
-2652.564103,204.75,64.48
-2652.564103,234,72.865
-2652.564103,263.25,81.268
-2652.564103,292.5,89.688
-2652.564103,321.75,98.125
-2652.564103,351,106.58
-2652.564103,380.25,115.05
-2652.564103,409.5,123.54
-2652.564103,438.75,132.04
-2652.564103,468,140.57
-2652.564103,497.25,149.11
-2652.564103,526.5,157.66
-2652.564103,555.75,166.24
-2652.564103,585,174.83
-2652.564103,614.25,183.44
-2652.564103,643.5,192.06
-2652.564103,672.75,200.7
-2652.564103,702,209.36
-2652.564103,731.25,218.04
-2652.564103,760.5,226.74
-2652.564103,789.75,235.45
-2652.564103,819,244.17
-2652.564103,848.25,252.92
-2652.564103,877.5,261.68
-2652.564103,906.75,270.46
-2652.564103,936,279.26
-2856.666667,-936,-260.95
-2856.666667,-906.75,-252.84
-2856.666667,-877.5,-244.72
-2856.666667,-848.25,-236.57
-2856.666667,-819,-228.41
-2856.666667,-789.75,-220.24
-2856.666667,-760.5,-212.05
-2856.666667,-731.25,-203.84
-2856.666667,-702,-195.61
-2856.666667,-672.75,-187.37
-2856.666667,-643.5,-179.11
-2856.666667,-614.25,-170.83
-2856.666667,-585,-162.54
-2856.666667,-555.75,-154.22
-2856.666667,-526.5,-145.9
-2856.666667,-497.25,-137.55
-2856.666667,-468,-129.19
-2856.666667,-438.75,-120.81
-2856.666667,-409.5,-112.42
-2856.666667,-380.25,-104.01
-2856.666667,-351,-95.581
-2856.666667,-321.75,-87.136
-2856.666667,-292.5,-78.674
-2856.666667,-263.25,-70.195
-2856.666667,-234,-61.7
-2856.666667,-204.75,-53.188
-2856.666667,-175.5,-44.659
-2856.666667,-146.25,-36.113
-2856.666667,-117,-27.55
-2856.666667,-87.75,-18.971
-2856.666667,-58.5,-10.375
-2856.666667,-29.25,-1.7616
-2856.666667,0,7.0667
-2856.666667,29.25,15.964
-2856.666667,58.5,24.878
-2856.666667,87.75,33.81
-2856.666667,117,42.758
-2856.666667,146.25,51.724
-2856.666667,175.5,60.707
-2856.666667,204.75,69.707
-2856.666667,234,78.725
-2856.666667,263.25,87.759
-2856.666667,292.5,96.811
-2856.666667,321.75,105.88
-2856.666667,351,114.97
-2856.666667,380.25,124.07
-2856.666667,409.5,133.19
-2856.666667,438.75,142.33
-2856.666667,468,151.48
-2856.666667,497.25,160.65
-2856.666667,526.5,169.84
-2856.666667,555.75,179.05
-2856.666667,585,188.27
-2856.666667,614.25,197.51
-2856.666667,643.5,206.77
-2856.666667,672.75,216.04
-2856.666667,702,225.33
-2856.666667,731.25,234.64
-2856.666667,760.5,243.97
-2856.666667,789.75,253.31
-2856.666667,819,262.67
-2856.666667,848.25,272.05
-2856.666667,877.5,281.44
-2856.666667,906.75,290.86
-2856.666667,936,300.28
-3060.683761,-936,-279.94
-3060.683761,-906.75,-271.21
-3060.683761,-877.5,-262.47
-3060.683761,-848.25,-253.7
-3060.683761,-819,-244.93
-3060.683761,-789.75,-236.13
-3060.683761,-760.5,-227.32
-3060.683761,-731.25,-218.49
-3060.683761,-702,-209.64
-3060.683761,-672.75,-200.78
-3060.683761,-643.5,-191.9
-3060.683761,-614.25,-183
-3060.683761,-585,-174.09
-3060.683761,-555.75,-165.16
-3060.683761,-526.5,-156.22
-3060.683761,-497.25,-147.25
-3060.683761,-468,-138.27
-3060.683761,-438.75,-129.27
-3060.683761,-409.5,-120.26
-3060.683761,-380.25,-111.23
-3060.683761,-351,-102.18
-3060.683761,-321.75,-93.118
-3060.683761,-292.5,-84.037
-3060.683761,-263.25,-74.939
-3060.683761,-234,-65.824
-3060.683761,-204.75,-56.693
-3060.683761,-175.5,-47.544
-3060.683761,-146.25,-38.379
-3060.683761,-117,-29.197
-3060.683761,-87.75,-19.998
-3060.683761,-58.5,-10.782
-3060.683761,-29.25,-1.55
-3060.683761,0,7.9172
-3060.683761,29.25,17.446
-3060.683761,58.5,26.993
-3060.683761,87.75,36.556
-3060.683761,117,46.136
-3060.683761,146.25,55.734
-3060.683761,175.5,65.349
-3060.683761,204.75,74.981
-3060.683761,234,84.63
-3060.683761,263.25,94.296
-3060.683761,292.5,103.98
-3060.683761,321.75,113.68
-3060.683761,351,123.4
-3060.683761,380.25,133.13
-3060.683761,409.5,142.89
-3060.683761,438.75,152.65
-3060.683761,468,162.44
-3060.683761,497.25,172.24
-3060.683761,526.5,182.06
-3060.683761,555.75,191.9
-3060.683761,585,201.76
-3060.683761,614.25,211.63
-3060.683761,643.5,221.52
-3060.683761,672.75,231.43
-3060.683761,702,241.35
-3060.683761,731.25,251.29
-3060.683761,760.5,261.25
-3060.683761,789.75,271.22
-3060.683761,819,281.21
-3060.683761,848.25,291.22
-3060.683761,877.5,301.25
-3060.683761,906.75,311.29
-3060.683761,936,321.35
-3264.700855,-936,-298.88
-3264.700855,-906.75,-289.53
-3264.700855,-877.5,-280.17
-3264.700855,-848.25,-270.79
-3264.700855,-819,-261.39
-3264.700855,-789.75,-251.98
-3264.700855,-760.5,-242.54
-3264.700855,-731.25,-233.1
-3264.700855,-702,-223.63
-3264.700855,-672.75,-214.15
-3264.700855,-643.5,-204.65
-3264.700855,-614.25,-195.14
-3264.700855,-585,-185.6
-3264.700855,-555.75,-176.05
-3264.700855,-526.5,-166.49
-3264.700855,-497.25,-156.9
-3264.700855,-468,-147.3
-3264.700855,-438.75,-137.69
-3264.700855,-409.5,-128.06
-3264.700855,-380.25,-118.41
-3264.700855,-351,-108.74
-3264.700855,-321.75,-99.055
-3264.700855,-292.5,-89.354
-3264.700855,-263.25,-79.637
-3264.700855,-234,-69.903
-3264.700855,-204.75,-60.152
-3264.700855,-175.5,-50.384
-3264.700855,-146.25,-40.599
-3264.700855,-117,-30.798
-3264.700855,-87.75,-20.98
-3264.700855,-58.5,-11.145
-3264.700855,-29.25,-1.2929
-3264.700855,0,8.8141
-3264.700855,29.25,18.975
-3264.700855,58.5,29.153
-3264.700855,87.75,39.348
-3264.700855,117,49.561
-3264.700855,146.25,59.79
-3264.700855,175.5,70.037
-3264.700855,204.75,80.301
-3264.700855,234,90.582
-3264.700855,263.25,100.88
-3264.700855,292.5,111.2
-3264.700855,321.75,121.53
-3264.700855,351,131.88
-3264.700855,380.25,142.24
-3264.700855,409.5,152.63
-3264.700855,438.75,163.03
-3264.700855,468,173.45
-3264.700855,497.25,183.88
-3264.700855,526.5,194.34
-3264.700855,555.75,204.81
-3264.700855,585,215.29
-3264.700855,614.25,225.8
-3264.700855,643.5,236.32
-3264.700855,672.75,246.86
-3264.700855,702,257.41
-3264.700855,731.25,267.98
-3264.700855,760.5,278.57
-3264.700855,789.75,289.18
-3264.700855,819,299.8
-3264.700855,848.25,310.45
-3264.700855,877.5,321.1
-3264.700855,906.75,331.78
-3264.700855,936,342.47
-3468.803419,-936,-317.78
-3468.803419,-906.75,-307.81
-3468.803419,-877.5,-297.83
-3468.803419,-848.25,-287.83
-3468.803419,-819,-277.81
-3468.803419,-789.75,-267.78
-3468.803419,-760.5,-257.73
-3468.803419,-731.25,-247.66
-3468.803419,-702,-237.57
-3468.803419,-672.75,-227.47
-3468.803419,-643.5,-217.35
-3468.803419,-614.25,-207.22
-3468.803419,-585,-197.07
-3468.803419,-555.75,-186.9
-3468.803419,-526.5,-176.71
-3468.803419,-497.25,-166.51
-3468.803419,-468,-156.29
-3468.803419,-438.75,-146.06
-3468.803419,-409.5,-135.8
-3468.803419,-380.25,-125.53
-3468.803419,-351,-115.25
-3468.803419,-321.75,-104.95
-3468.803419,-292.5,-94.626
-3468.803419,-263.25,-84.289
-3468.803419,-234,-73.936
-3468.803419,-204.75,-63.565
-3468.803419,-175.5,-53.178
-3468.803419,-146.25,-42.774
-3468.803419,-117,-32.353
-3468.803419,-87.75,-21.916
-3468.803419,-58.5,-11.462
-3468.803419,-29.25,-0.99032
-3468.803419,0,9.7575
-3468.803419,29.25,20.55
-3468.803419,58.5,31.36
-3468.803419,87.75,42.188
-3468.803419,117,53.032
-3468.803419,146.25,63.893
-3468.803419,175.5,74.772
-3468.803419,204.75,85.668
-3468.803419,234,96.581
-3468.803419,263.25,107.51
-3468.803419,292.5,118.46
-3468.803419,321.75,129.42
-3468.803419,351,140.4
-3468.803419,380.25,151.4
-3468.803419,409.5,162.42
-3468.803419,438.75,173.45
-3468.803419,468,184.5
-3468.803419,497.25,195.57
-3468.803419,526.5,206.65
-3468.803419,555.75,217.75
-3468.803419,585,228.87
-3468.803419,614.25,240.01
-3468.803419,643.5,251.16
-3468.803419,672.75,262.33
-3468.803419,702,273.52
-3468.803419,731.25,284.72
-3468.803419,760.5,295.95
-3468.803419,789.75,307.18
-3468.803419,819,318.44
-3468.803419,848.25,329.71
-3468.803419,877.5,341
-3468.803419,906.75,352.31
-3468.803419,936,363.64
-3672.820513,-936,-336.63
-3672.820513,-906.75,-326.05
-3672.820513,-877.5,-315.44
-3672.820513,-848.25,-304.82
-3672.820513,-819,-294.19
-3672.820513,-789.75,-283.53
-3672.820513,-760.5,-272.86
-3672.820513,-731.25,-262.18
-3672.820513,-702,-251.47
-3672.820513,-672.75,-240.75
-3672.820513,-643.5,-230.01
-3672.820513,-614.25,-219.26
-3672.820513,-585,-208.49
-3672.820513,-555.75,-197.7
-3672.820513,-526.5,-186.9
-3672.820513,-497.25,-176.07
-3672.820513,-468,-165.24
-3672.820513,-438.75,-154.38
-3672.820513,-409.5,-143.51
-3672.820513,-380.25,-132.62
-3672.820513,-351,-121.71
-3672.820513,-321.75,-110.79
-3672.820513,-292.5,-99.852
-3672.820513,-263.25,-88.896
-3672.820513,-234,-77.923
-3672.820513,-204.75,-66.933
-3672.820513,-175.5,-55.927
-3672.820513,-146.25,-44.904
-3672.820513,-117,-33.863
-3672.820513,-87.75,-22.806
-3672.820513,-58.5,-11.733
-3672.820513,-29.25,-0.64219
-3672.820513,0,10.747
-3672.820513,29.25,22.172
-3672.820513,58.5,33.614
-3672.820513,87.75,45.073
-3672.820513,117,56.549
-3672.820513,146.25,68.043
-3672.820513,175.5,79.553
-3672.820513,204.75,91.081
-3672.820513,234,102.63
-3672.820513,263.25,114.19
-3672.820513,292.5,125.77
-3672.820513,321.75,137.36
-3672.820513,351,148.98
-3672.820513,380.25,160.61
-3672.820513,409.5,172.25
-3672.820513,438.75,183.92
-3672.820513,468,195.6
-3672.820513,497.25,207.3
-3672.820513,526.5,219.02
-3672.820513,555.75,230.75
-3672.820513,585,242.5
-3672.820513,614.25,254.27
-3672.820513,643.5,266.05
-3672.820513,672.75,277.86
-3672.820513,702,289.67
-3672.820513,731.25,301.51
-3672.820513,760.5,313.36
-3672.820513,789.75,325.23
-3672.820513,819,337.12
-3672.820513,848.25,349.03
-3672.820513,877.5,360.95
-3672.820513,906.75,372.89
-3672.820513,936,384.85
-3876.837607,-936,-355.44
-3876.837607,-906.75,-344.23
-3876.837607,-877.5,-333.01
-3876.837607,-848.25,-321.77
-3876.837607,-819,-310.52
-3876.837607,-789.75,-299.24
-3876.837607,-760.5,-287.95
-3876.837607,-731.25,-276.65
-3876.837607,-702,-265.32
-3876.837607,-672.75,-253.98
-3876.837607,-643.5,-242.63
-3876.837607,-614.25,-231.25
-3876.837607,-585,-219.86
-3876.837607,-555.75,-208.45
-3876.837607,-526.5,-197.03
-3876.837607,-497.25,-185.59
-3876.837607,-468,-174.13
-3876.837607,-438.75,-162.66
-3876.837607,-409.5,-151.17
-3876.837607,-380.25,-139.66
-3876.837607,-351,-128.13
-3876.837607,-321.75,-116.59
-3876.837607,-292.5,-105.03
-3876.837607,-263.25,-93.457
-3876.837607,-234,-81.865
-3876.837607,-204.75,-70.256
-3876.837607,-175.5,-58.63
-3876.837607,-146.25,-46.987
-3876.837607,-117,-35.328
-3876.837607,-87.75,-23.652
-3876.837607,-58.5,-11.958
-3876.837607,-29.25,-0.24855
-3876.837607,0,11.784
-3876.837607,29.25,23.84
-3876.837607,58.5,35.914
-3876.837607,87.75,48.005
-3876.837607,117,60.113
-3876.837607,146.25,72.238
-3876.837607,175.5,84.381
-3876.837607,204.75,96.54
-3876.837607,234,108.72
-3876.837607,263.25,120.91
-3876.837607,292.5,133.12
-3876.837607,321.75,145.35
-3876.837607,351,157.59
-3876.837607,380.25,169.86
-3876.837607,409.5,182.14
-3876.837607,438.75,194.43
-3876.837607,468,206.75
-3876.837607,497.25,219.08
-3876.837607,526.5,231.43
-3876.837607,555.75,243.79
-3876.837607,585,256.17
-3876.837607,614.25,268.57
-3876.837607,643.5,280.99
-3876.837607,672.75,293.42
-3876.837607,702,305.88
-3876.837607,731.25,318.34
-3876.837607,760.5,330.83
-3876.837607,789.75,343.33
-3876.837607,819,355.85
-3876.837607,848.25,368.39
-3876.837607,877.5,380.94
-3876.837607,906.75,393.51
-3876.837607,936,406.1
-4080.854701,-936,-374.2
-4080.854701,-906.75,-362.38
-4080.854701,-877.5,-350.53
-4080.854701,-848.25,-338.67
-4080.854701,-819,-326.8
-4080.854701,-789.75,-314.91
-4080.854701,-760.5,-303
-4080.854701,-731.25,-291.07
-4080.854701,-702,-279.13
-4080.854701,-672.75,-267.17
-4080.854701,-643.5,-255.19
-4080.854701,-614.25,-243.2
-4080.854701,-585,-231.19
-4080.854701,-555.75,-219.16
-4080.854701,-526.5,-207.12
-4080.854701,-497.25,-195.06
-4080.854701,-468,-182.98
-4080.854701,-438.75,-170.89
-4080.854701,-409.5,-158.78
-4080.854701,-380.25,-146.65
-4080.854701,-351,-134.51
-4080.854701,-321.75,-122.35
-4080.854701,-292.5,-110.17
-4080.854701,-263.25,-97.973
-4080.854701,-234,-85.761
-4080.854701,-204.75,-73.533
-4080.854701,-175.5,-61.288
-4080.854701,-146.25,-49.026
-4080.854701,-117,-36.747
-4080.854701,-87.75,-24.451
-4080.854701,-58.5,-12.139
-4080.854701,-29.25,0.19499
-4080.854701,0,12.866
-4080.854701,29.25,25.555
-4080.854701,58.5,38.26
-4080.854701,87.75,50.983
-4080.854701,117,63.723
-4080.854701,146.25,76.48
-4080.854701,175.5,89.255
-4080.854701,204.75,102.05
-4080.854701,234,114.85
-4080.854701,263.25,127.68
-4080.854701,292.5,140.52
-4080.854701,321.75,153.38
-4080.854701,351,166.26
-4080.854701,380.25,179.15
-4080.854701,409.5,192.07
-4080.854701,438.75,204.99
-4080.854701,468,217.94
-4080.854701,497.25,230.9
-4080.854701,526.5,243.88
-4080.854701,555.75,256.88
-4080.854701,585,269.89
-4080.854701,614.25,282.93
-4080.854701,643.5,295.97
-4080.854701,672.75,309.04
-4080.854701,702,322.12
-4080.854701,731.25,335.22
-4080.854701,760.5,348.34
-4080.854701,789.75,361.48
-4080.854701,819,374.63
-4080.854701,848.25,387.8
-4080.854701,877.5,400.98
-4080.854701,906.75,414.18
-4080.854701,936,427.4
-4268.632479,-936,-391.42
-4268.632479,-906.75,-379.03
-4268.632479,-877.5,-366.61
-4268.632479,-848.25,-354.19
-4268.632479,-819,-341.74
-4268.632479,-789.75,-329.28
-4268.632479,-760.5,-316.8
-4268.632479,-731.25,-304.3
-4268.632479,-702,-291.79
-4268.632479,-672.75,-279.26
-4268.632479,-643.5,-266.72
-4268.632479,-614.25,-254.15
-4268.632479,-585,-241.57
-4268.632479,-555.75,-228.98
-4268.632479,-526.5,-216.36
-4268.632479,-497.25,-203.73
-4268.632479,-468,-191.09
-4268.632479,-438.75,-178.42
-4268.632479,-409.5,-165.74
-4268.632479,-380.25,-153.04
-4268.632479,-351,-140.33
-4268.632479,-321.75,-127.6
-4268.632479,-292.5,-114.85
-4268.632479,-263.25,-102.09
-4268.632479,-234,-89.306
-4268.632479,-204.75,-76.508
-4268.632479,-175.5,-63.693
-4268.632479,-146.25,-50.861
-4268.632479,-117,-38.012
-4268.632479,-87.75,-25.147
-4268.632479,-58.5,-12.264
-4268.632479,-29.25,0.65077
-4268.632479,0,13.903
-4268.632479,29.25,27.173
-4268.632479,58.5,40.46
-4268.632479,87.75,53.764
-4268.632479,117,67.086
-4268.632479,146.25,80.424
-4268.632479,175.5,93.78
-4268.632479,204.75,107.15
-4268.632479,234,120.54
-4268.632479,263.25,133.95
-4268.632479,292.5,147.37
-4268.632479,321.75,160.81
-4268.632479,351,174.27
-4268.632479,380.25,187.75
-4268.632479,409.5,201.24
-4268.632479,438.75,214.75
-4268.632479,468,228.28
-4268.632479,497.25,241.82
-4268.632479,526.5,255.38
-4268.632479,555.75,268.96
-4268.632479,585,282.56
-4268.632479,614.25,296.17
-4268.632479,643.5,309.8
-4268.632479,672.75,323.45
-4268.632479,702,337.11
-4268.632479,731.25,350.79
-4268.632479,760.5,364.49
-4268.632479,789.75,378.21
-4268.632479,819,391.94
-4268.632479,848.25,405.69
-4268.632479,877.5,419.46
-4268.632479,906.75,433.24
-4268.632479,936,447.04
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Hybrid_Parameters.vhctl
deleted file mode 100644
index ade389a0ca..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Hybrid_Parameters.vhctl
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": "",
-    "Date": "2020-08-24T08:08:59.2231036Z",
-    "AppVersion": "3",
-    "FileVersion": 1
-  },
-  "Body": {
-    "EquivalenceFactor": 2.5,
-    "MinSoC": 20.0,
-    "MaxSoC": 80.0,
-    "TargetSoC": 50.0,
-    "AuxBufferTime": 5.0,
-    "AuxBufferChgTime": 5.0,
-    "MinICEOnTime": 10.0
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_2240.vimax b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_2240.vimax
deleted file mode 100644
index a714cbf2f4..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_2240.vimax
+++ /dev/null
@@ -1,4 +0,0 @@
-SOC, I_charge, I_discharge
-0, 2240, 2240
-50, 2240, 2240
-100, 2240, 2240
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_280.vimax b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_280.vimax
deleted file mode 100644
index 8aeff5bf12..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/MaxCurrent_280.vimax
+++ /dev/null
@@ -1,4 +0,0 @@
-SOC, I_charge, I_discharge
-0, 280, 280
-50, 280, 280
-100, 280, 280
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vecto
deleted file mode 100644
index 7466a03ccc..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vecto
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": "",
-    "Date": "2022-03-29T16:22:48.2775304Z",
-    "AppVersion": "3",
-    "FileVersion": 8
-  },
-  "Body": {
-    "SavedInDeclMode": false,
-    "EngineOnlyMode": false,
-    "VehicleFile": "P3.vveh",
-    "EngineFile": "Engine_325kW_12.7l.veng",
-    "GearboxFile": "AMT_12.vgbx",
-    "TCU": "AMT_12.vgbx",
-    "HybridStrategyParams": "Hybrid_Parameters.vhctl",
-    "Padd": 3000.0,
-    "Paux_ICEOff_Driving": 0.0,
-    "Paux_ICEOff_Standstill": 0.0,
-    "Padd_electric": 0.0,
-    "VACC": "Truck.vacc",
-    "EngineStopStartAtVehicleStopThreshold": 0.0,
-    "EngineStopStartMaxOffTimespan": 0.0,
-    "EngineStopStartUtilityFactor": 0.0,
-    "EngineStopStartUtilityFactorDriving": 0.0,
-    "EcoRollMinSpeed": 0.0,
-    "EcoRollActivationDelay": 0.0,
-    "EcoRollUnderspeedThreshold": 0.0,
-    "EcoRollMaxAcceleration": 0.0,
-    "PCCEnableSpeed": 0.0,
-    "PCCMinSpeed": 0.0,
-    "PCCUnderspeed": 0.0,
-    "PCCOverSpeed": 5.0,
-    "PCCPreviewDistanceUC1": 0.0,
-    "PCCPreviewDistanceUC2": 0.0,
-    "LAC": {
-      "Enabled": true,
-      "PreviewDistanceFactor": 10.0,
-      "DF_offset": 2.5,
-      "DF_scaling": 1.5,
-      "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": "",
-      "MinSpeed": 50.0
-    },
-    "OverSpeedEcoRoll": {
-      "Mode": "Overspeed",
-      "MinSpeed": 50.0,
-      "OverSpeed": 2.5
-    },
-    "Cycles": [
-      "C:\\Users\\michaelkrisper\\Documents\\mk_vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\Components\\Retarder\\E3\\LongHaul_short.vdri"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vveh
deleted file mode 100644
index 1e42f2858d..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/P3.vveh
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "Header": {
-    "CreatedBy": "",
-    "Date": "2022-03-29T15:47:26.2638558Z",
-    "AppVersion": "3",
-    "FileVersion": 10
-  },
-  "Body": {
-    "SavedInDeclMode": false,
-    "VehCat": "Tractor",
-    "LegislativeClass": "Unknown",
-    "CurbWeight": 8229.0,
-    "CurbWeightExtra": 7500.0,
-    "MassMax": 18.0,
-    "Loading": 19300.0,
-    "rdyn": 492.0,
-    "CdCorrMode": "CdofVdecl",
-    "CdCorrFile": "",
-    "AxleConfig": {
-      "Type": "4x2",
-      "Axles": [
-        {
-          "Inertia": 14.9,
-          "Wheels": "315/70 R22.5",
-          "AxleWeightShare": 0.2,
-          "TwinTyres": false,
-          "RRCISO": 0.0055,
-          "FzISO": 33350.0,
-          "Type": "VehicleNonDriven"
-        },
-        {
-          "Inertia": 14.9,
-          "Wheels": "315/70 R22.5",
-          "AxleWeightShare": 0.25,
-          "TwinTyres": true,
-          "RRCISO": 0.0065,
-          "FzISO": 33350.0,
-          "Type": "VehicleDriven"
-        },
-        {
-          "Inertia": 19.2,
-          "Wheels": "385/65 R22.5",
-          "AxleWeightShare": 0.18333,
-          "TwinTyres": false,
-          "RRCISO": 0.0055,
-          "FzISO": 41690.0,
-          "Type": "Trailer"
-        },
-        {
-          "Inertia": 19.2,
-          "Wheels": "385/65 R22.5",
-          "AxleWeightShare": 0.18333,
-          "TwinTyres": false,
-          "RRCISO": 0.0055,
-          "FzISO": 41690.0,
-          "Type": "Trailer"
-        },
-        {
-          "Inertia": 19.2,
-          "Wheels": "385/65 R22.5",
-          "AxleWeightShare": 0.18334,
-          "TwinTyres": false,
-          "RRCISO": 0.0055,
-          "FzISO": 41690.0,
-          "Type": "Trailer"
-        }
-      ]
-    },
-    "EngineStopStart": true,
-    "EcoRoll": "None",
-    "PredictiveCruiseControl": "None",
-    "ATEcoRollReleaseLockupClutch": false,
-    "CdA": 5.3,
-    "VehicleHeight": 4.0,
-    "IdlingSpeed": 600.0,
-    "Retarder": {
-      "Type": "secondary",
-      "Ratio": 1.5,
-      "File": "Default.vrlm"
-    },
-    "Angledrive": {
-      "Type": "None",
-      "Ratio": 0.0,
-      "LossMap": ""
-    },
-    "PTO": {
-      "Type": "None",
-      "LossMap": "",
-      "Cycle": "",
-      "CycleDriving": ""
-    },
-    "TorqueLimits": {},
-    "InitialSoC": 80.0,
-    "PowertrainConfiguration": "ParallelHybrid",
-    "ElectricMotors": [
-      {
-        "Count": 1,
-        "Ratio": 1.0,
-        "Position": "P3",
-        "MotorFile": "GenericEMotor_140kW_936Nm.vem",
-        "MechanicalEfficiency": 1.0
-      }
-    ],
-    "Batteries": [
-      {
-        "NumPacks": 1,
-        "BatteryFile": "GenericBattery_10kWh_658V.vbat",
-        "StreamId": 0
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_7c7l.veng
similarity index 57%
rename from VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Engine_325kW_12.7l.veng
rename to VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_7c7l.veng
index 084062afcc..55c93808f6 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_7c7l.veng
@@ -1,32 +1,32 @@
 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2020-08-21T09:24:04.0725494Z",
+    "Date": "2021-06-17T07:29:46.1581600Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": false,
-    "ModelName": "325kW 12.7l Engine",
-    "Displacement": "12740",
+    "ModelName": "209kW 7.7l Engine",
+    "Displacement": "7700",
     "IdlingSpeed": 600.0,
-    "Inertia": 5.1498,
+    "Inertia": 3.33,
     "Fuels": [
       {
         "WHTC-Urban": 0.0,
         "WHTC-Rural": 0.0,
         "WHTC-Motorway": 0.0,
-        "WHTC-Engineering": 1.0,
+        "WHTC-Engineering": 1.0090832895,
         "ColdHotBalancingFactor": 0.0,
         "CFRegPer": 1.0,
-        "FuelMap": "325kW.vmap",
+        "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
       }
     ],
-    "RatedPower": 0.0,
-    "RatedSpeed": 0.0,
-    "MaxTorque": 0.0,
-    "FullLoadCurve": "325kW.vfld",
+    "RatedPower": 209000,
+    "RatedSpeed": 2550.0,
+    "MaxTorque": 1100,
+    "FullLoadCurve": "209kW_ICE_fld.vfld",
     "WHRType": [
       "None"
     ],
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_Map.vmap b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_Map.vmap
new file mode 100644
index 0000000000..10f19d740c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_Map.vmap
@@ -0,0 +1,163 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+600.00,0.00,648.214
+600.00,68.85,1626.915
+600.00,98.35,2053.103
+600.00,195.48,3383.983
+600.00,293.83,4726.347
+600.00,392.18,6058.504
+600.00,489.31,8107.779
+600.00,587.66,10186.402
+600.00,684.78,12239.042
+600.00,783.14,14317.665
+600.00,881.49,16396.288
+600.00,978.61,18448.929
+600.00,1076.96,20527.552
+600.00,1175.32,22606.175
+851.61,0.00,928.937
+851.61,64.67,1892.325
+851.61,92.39,2405.282
+851.61,183.63,4070.477
+851.61,276.02,5758.641
+851.61,368.41,7453.185
+851.61,459.65,9663.237
+851.61,552.04,11837.561
+851.61,643.28,13995.297
+851.61,735.67,16050.952
+851.61,828.06,18103.130
+851.61,919.30,20129.657
+851.61,1011.69,22181.836
+851.61,1104.09,24234.015
+1103.23,0.00,1209.659
+1103.23,62.41,2157.736
+1103.23,89.15,2758.737
+1103.23,177.19,4758.248
+1103.23,266.34,6792.210
+1103.23,355.49,8847.865
+1103.23,443.52,11219.971
+1103.23,532.67,13488.720
+1103.23,620.71,15726.845
+1103.23,709.86,17966.245
+1103.23,799.01,20229.890
+1103.23,887.05,22492.259
+1103.23,976.20,24743.508
+1103.23,1065.35,26994.757
+1354.84,0.00,1490.382
+1354.84,60.98,2421.870
+1354.84,87.11,3112.193
+1354.84,173.14,5444.742
+1354.84,260.25,7824.504
+1354.84,347.36,10242.546
+1354.84,433.39,12776.705
+1354.84,520.50,15141.155
+1354.84,606.52,17457.117
+1354.84,693.63,19881.539
+1354.84,780.75,22341.689
+1354.84,866.77,24801.840
+1354.84,953.88,27249.231
+1354.84,1041.00,30075.597
+1606.45,0.00,1964.218
+1606.45,60.00,2898.713
+1606.45,85.71,3701.160
+1606.45,170.35,6375.138
+1606.45,256.07,9132.915
+1606.45,341.78,11916.086
+1606.45,426.42,14629.424
+1606.45,512.14,17373.235
+1606.45,596.78,20240.205
+1606.45,682.49,23084.322
+1606.45,768.20,25784.963
+1606.45,852.85,28443.704
+1606.45,938.56,31162.121
+1606.45,1024.27,33987.192
+1858.06,0.00,2405.472
+1858.06,59.28,3395.960
+1858.06,84.69,4296.748
+1858.06,168.33,7298.534
+1858.06,253.02,10456.979
+1858.06,337.71,13614.161
+1858.06,421.35,16806.717
+1858.06,506.04,19948.738
+1858.06,589.67,23098.339
+1858.06,674.37,26265.628
+1858.06,759.06,29333.109
+1858.06,842.69,32242.669
+1858.06,927.39,35435.225
+1858.06,1012.08,38645.468
+2109.68,0.00,2908.296
+2109.68,58.74,4008.698
+2109.68,83.92,4995.396
+2109.68,166.78,8282.706
+2109.68,250.70,11854.275
+2109.68,334.61,15399.314
+2109.68,417.48,18962.040
+2109.68,501.40,22400.954
+2109.68,584.26,25903.038
+2109.68,668.18,29565.571
+2109.68,752.10,33148.511
+2109.68,834.96,36787.039
+2109.68,918.88,40596.124
+2109.68,1002.79,44447.432
+2361.29,0.00,3517.244
+2361.29,58.31,4836.211
+2361.29,83.30,5889.868
+2361.29,165.57,9403.322
+2361.29,248.87,13398.123
+2361.29,332.18,17295.644
+2361.29,414.44,21267.704
+2361.29,497.74,25214.497
+2361.29,580.01,29106.965
+2361.29,663.31,33230.630
+2361.29,746.62,37409.885
+2361.29,828.88,41464.064
+2361.29,912.18,45307.994
+2361.29,995.49,49151.923
+2612.90,0.00,4272.744
+2612.90,57.97,5567.707
+2612.90,82.81,6727.488
+2612.90,164.59,10597.214
+2612.90,247.40,14941.971
+2612.90,330.21,19262.724
+2612.90,411.98,23531.678
+2612.90,494.79,27996.455
+2612.90,576.57,32694.958
+2612.90,659.38,37346.716
+2612.90,742.19,41862.028
+2612.90,823.97,46367.264
+2612.90,906.78,50929.527
+2612.90,989.59,55491.791
+2864.52,0.00,4975.182
+2864.52,57.68,6271.408
+2864.52,82.40,7570.161
+2864.52,163.78,11901.020
+2864.52,246.18,16541.408
+2864.52,328.59,21435.734
+2864.52,409.96,26482.929
+2864.52,492.36,31523.807
+2864.52,573.74,36936.118
+2864.52,656.14,42358.536
+2864.52,738.54,47310.978
+2864.52,819.92,52201.514
+2864.52,902.32,57153.955
+2864.52,984.73,62106.397
+535.00,-48.25,0.000
+795.00,-53.16,0.000
+1055.00,-59.37,0.000
+1315.00,-66.29,0.000
+1575.00,-73.79,0.000
+1835.00,-81.42,0.000
+2095.00,-88.73,0.000
+2355.00,-95.54,0.000
+2615.00,-102.74,0.000
+2875.00,-110.97,0.000
+3005.00,-115.10,0.000
+535.00,-117.19,0.000
+795.00,-115.02,0.000
+1055.00,-117.63,0.000
+1315.00,-122.38,0.000
+1575.00,-128.43,0.000
+1835.00,-135.02,0.000
+2095.00,-141.54,0.000
+2355.00,-147.74,0.000
+2615.00,-154.45,0.000
+2875.00,-162.29,0.000
+3005.00,-166.24,0.000
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_fld.vfld b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_fld.vfld
new file mode 100644
index 0000000000..9fa844476e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/209kW_ICE_fld.vfld
@@ -0,0 +1,7 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600.00,385.00,-55.851
+1321.50,1100.00,-61.072
+1867.50,1100.00,-75.131
+2550.00,782.67,-97.074
+3291.00,0.00,-144.231
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle.vgbx b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle.vgbx
new file mode 100644
index 0000000000..14822fe8ad
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle.vgbx
@@ -0,0 +1,33 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-08-21T09:25:38.1210499Z",
+    "AppVersion": "3",
+    "FileVersion": 6
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "ModelName": "tractor_12gear_example",
+    "Inertia": 0.0,
+    "TracInt": 1.0,
+    "Gears": [
+      {
+        "Ratio": 2.64,
+        "LossMap": "Axle_4x2_Tractor.vtlm"
+      }
+    ],
+    "TqReserve": 20.0,
+    "ShiftTime": 2.0,
+    "StartTqReserve": 20.0,
+    "StartSpeed": 2.0,
+    "StartAcc": 0.6,
+    "GearboxType": "AMT",
+    "TorqueConverter": {
+      "Enabled": false
+    },
+    "DownshiftAfterUpshiftDelay": 6.0,
+    "UpshiftAfterDownshiftDelay": 6.0,
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle_4x2_Tractor.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Axle_4x2_Tractor.vtlm
rename to VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Axle_4x2_Tractor.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_Map.vemo
new file mode 100644
index 0000000000..07c6fe733d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_Map.vemo
@@ -0,0 +1,925 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-500.00,0.000
+0.00,-475.00,0.000
+0.00,-450.00,0.000
+0.00,-425.00,0.000
+0.00,-400.00,0.000
+0.00,-375.00,0.000
+0.00,-350.00,-0.220
+0.00,-325.00,-0.510
+0.00,-300.00,-0.671
+0.00,-275.00,-0.765
+0.00,-250.00,-0.813
+0.00,-225.00,-0.826
+0.00,-200.00,-0.811
+0.00,-175.00,-0.771
+0.00,-150.00,-0.710
+0.00,-125.00,-0.629
+0.00,-100.00,-0.531
+0.00,-75.00,-0.416
+0.00,-50.00,-0.287
+0.00,-25.00,-0.143
+0.00,-5.00,-0.015
+0.00,5.00,0.059
+0.00,25.00,0.264
+0.00,50.00,0.527
+0.00,75.00,0.800
+0.00,100.00,1.080
+0.00,125.00,1.370
+0.00,150.00,1.667
+0.00,175.00,1.972
+0.00,200.00,2.285
+0.00,225.00,2.606
+0.00,250.00,2.935
+0.00,275.00,3.270
+0.00,300.00,3.613
+0.00,325.00,3.964
+0.00,350.00,4.321
+0.00,375.00,4.685
+0.00,400.00,5.056
+0.00,425.00,5.433
+0.00,450.00,5.818
+0.00,475.00,6.209
+0.00,500.00,6.606
+70.00,-500.00,0.000
+70.00,-475.00,0.000
+70.00,-450.00,0.000
+70.00,-425.00,0.000
+70.00,-400.00,0.000
+70.00,-375.00,0.000
+70.00,-350.00,-0.410
+70.00,-325.00,-0.623
+70.00,-300.00,-0.733
+70.00,-275.00,-0.790
+70.00,-250.00,-0.811
+70.00,-225.00,-0.805
+70.00,-200.00,-0.776
+70.00,-175.00,-0.727
+70.00,-150.00,-0.662
+70.00,-125.00,-0.581
+70.00,-100.00,-0.487
+70.00,-75.00,-0.379
+70.00,-50.00,-0.260
+70.00,-25.00,-0.129
+70.00,-5.00,-0.014
+70.00,5.00,0.051
+70.00,25.00,0.228
+70.00,50.00,0.454
+70.00,75.00,0.688
+70.00,100.00,0.929
+70.00,125.00,1.176
+70.00,150.00,1.429
+70.00,175.00,1.689
+70.00,200.00,1.956
+70.00,225.00,2.228
+70.00,250.00,2.507
+70.00,275.00,2.791
+70.00,300.00,3.081
+70.00,325.00,3.377
+70.00,350.00,3.678
+70.00,375.00,3.985
+70.00,400.00,4.298
+70.00,425.00,4.616
+70.00,450.00,4.939
+70.00,475.00,5.267
+70.00,500.00,5.601
+700.00,-500.00,-33.378
+700.00,-475.00,-31.792
+700.00,-450.00,-30.197
+700.00,-425.00,-28.593
+700.00,-400.00,-26.979
+700.00,-375.00,-25.356
+700.00,-350.00,-23.723
+700.00,-325.00,-22.081
+700.00,-300.00,-20.429
+700.00,-275.00,-18.768
+700.00,-250.00,-17.098
+700.00,-225.00,-15.419
+700.00,-200.00,-13.730
+700.00,-175.00,-12.033
+700.00,-150.00,-10.326
+700.00,-125.00,-8.610
+700.00,-100.00,-6.885
+700.00,-75.00,-5.151
+700.00,-50.00,-3.408
+700.00,-25.00,-1.655
+700.00,-5.00,-0.228
+700.00,5.00,0.473
+700.00,25.00,2.006
+700.00,50.00,3.922
+700.00,75.00,5.846
+700.00,100.00,7.779
+700.00,125.00,9.720
+700.00,150.00,11.670
+700.00,175.00,13.628
+700.00,200.00,15.596
+700.00,225.00,17.572
+700.00,250.00,19.556
+700.00,275.00,21.550
+700.00,300.00,23.552
+700.00,325.00,25.562
+700.00,350.00,27.581
+700.00,375.00,29.608
+700.00,400.00,31.644
+700.00,425.00,33.689
+700.00,450.00,35.742
+700.00,475.00,37.803
+700.00,500.00,39.872
+1400.00,-500.00,-68.844
+1400.00,-475.00,-65.493
+1400.00,-450.00,-62.131
+1400.00,-425.00,-58.757
+1400.00,-400.00,-55.373
+1400.00,-375.00,-51.979
+1400.00,-350.00,-48.573
+1400.00,-325.00,-45.156
+1400.00,-300.00,-41.729
+1400.00,-275.00,-38.290
+1400.00,-250.00,-34.841
+1400.00,-225.00,-31.381
+1400.00,-200.00,-27.911
+1400.00,-175.00,-24.430
+1400.00,-150.00,-20.938
+1400.00,-125.00,-17.435
+1400.00,-100.00,-13.921
+1400.00,-75.00,-10.397
+1400.00,-50.00,-6.861
+1400.00,-25.00,-3.312
+1400.00,-5.00,-0.415
+1400.00,5.00,0.965
+1400.00,25.00,4.010
+1400.00,50.00,7.801
+1400.00,75.00,11.601
+1400.00,100.00,15.411
+1400.00,125.00,19.231
+1400.00,150.00,23.062
+1400.00,175.00,26.903
+1400.00,200.00,30.755
+1400.00,225.00,34.617
+1400.00,250.00,38.490
+1400.00,275.00,42.374
+1400.00,300.00,46.268
+1400.00,325.00,50.172
+1400.00,350.00,54.087
+1400.00,375.00,58.012
+1400.00,400.00,61.948
+1400.00,425.00,65.894
+1400.00,450.00,69.851
+1400.00,475.00,73.817
+1400.00,500.00,77.795
+2100.00,-500.00,-104.021
+2100.00,-475.00,-98.928
+2100.00,-450.00,-93.822
+2100.00,-425.00,-88.702
+2100.00,-400.00,-83.569
+2100.00,-375.00,-78.421
+2100.00,-350.00,-73.260
+2100.00,-325.00,-68.086
+2100.00,-300.00,-62.898
+2100.00,-275.00,-57.696
+2100.00,-250.00,-52.480
+2100.00,-225.00,-47.251
+2100.00,-200.00,-42.009
+2100.00,-175.00,-36.753
+2100.00,-150.00,-31.483
+2100.00,-125.00,-26.200
+2100.00,-100.00,-20.903
+2100.00,-75.00,-15.592
+2100.00,-50.00,-10.267
+2100.00,-25.00,-4.922
+2100.00,-5.00,-0.517
+2100.00,5.00,1.493
+2100.00,25.00,6.057
+2100.00,50.00,11.726
+2100.00,75.00,17.405
+2100.00,100.00,23.096
+2100.00,125.00,28.800
+2100.00,150.00,34.517
+2100.00,175.00,40.248
+2100.00,200.00,45.992
+2100.00,225.00,51.749
+2100.00,250.00,57.520
+2100.00,275.00,63.304
+2100.00,300.00,69.102
+2100.00,325.00,74.913
+2100.00,350.00,80.737
+2100.00,375.00,86.575
+2100.00,400.00,92.426
+2100.00,425.00,98.290
+2100.00,450.00,104.167
+2100.00,475.00,110.058
+2100.00,500.00,115.962
+2800.00,-500.00,-138.914
+2800.00,-475.00,-132.103
+2800.00,-450.00,-125.274
+2800.00,-425.00,-118.427
+2800.00,-400.00,-111.562
+2800.00,-375.00,-104.680
+2800.00,-350.00,-97.780
+2800.00,-325.00,-90.863
+2800.00,-300.00,-83.928
+2800.00,-275.00,-76.976
+2800.00,-250.00,-70.005
+2800.00,-225.00,-63.018
+2800.00,-200.00,-56.013
+2800.00,-175.00,-48.990
+2800.00,-150.00,-41.950
+2800.00,-125.00,-34.893
+2800.00,-100.00,-27.817
+2800.00,-75.00,-20.723
+2800.00,-50.00,-13.610
+2800.00,-25.00,-6.467
+2800.00,-5.00,-0.452
+2800.00,5.00,2.063
+2800.00,25.00,8.158
+2800.00,50.00,15.710
+2800.00,75.00,23.271
+2800.00,100.00,30.847
+2800.00,125.00,38.440
+2800.00,150.00,46.049
+2800.00,175.00,53.676
+2800.00,200.00,61.321
+2800.00,225.00,68.983
+2800.00,250.00,76.662
+2800.00,275.00,84.358
+2800.00,300.00,92.072
+2800.00,325.00,99.803
+2800.00,350.00,107.551
+2800.00,375.00,115.317
+2800.00,400.00,123.100
+2800.00,425.00,130.900
+2800.00,450.00,138.717
+2800.00,475.00,146.551
+2800.00,500.00,154.402
+3500.00,-500.00,-173.512
+3500.00,-475.00,-165.004
+3500.00,-450.00,-156.473
+3500.00,-425.00,-147.919
+3500.00,-400.00,-139.342
+3500.00,-375.00,-130.742
+3500.00,-350.00,-122.120
+3500.00,-325.00,-113.475
+3500.00,-300.00,-104.807
+3500.00,-275.00,-96.117
+3500.00,-250.00,-87.404
+3500.00,-225.00,-78.668
+3500.00,-200.00,-69.910
+3500.00,-175.00,-61.129
+3500.00,-150.00,-52.326
+3500.00,-125.00,-43.500
+3500.00,-100.00,-34.650
+3500.00,-75.00,-25.777
+3500.00,-50.00,-16.876
+3500.00,-25.00,-7.933
+3500.00,-5.00,0.000
+3500.00,5.00,2.683
+3500.00,25.00,10.326
+3500.00,50.00,19.764
+3500.00,75.00,29.211
+3500.00,100.00,38.677
+3500.00,125.00,48.164
+3500.00,150.00,57.672
+3500.00,175.00,67.203
+3500.00,200.00,76.756
+3500.00,225.00,86.331
+3500.00,250.00,95.929
+3500.00,275.00,105.549
+3500.00,300.00,115.191
+3500.00,325.00,124.856
+3500.00,350.00,134.543
+3500.00,375.00,144.252
+3500.00,400.00,153.983
+3500.00,425.00,163.737
+3500.00,450.00,173.513
+3500.00,475.00,183.310
+3500.00,500.00,193.130
+4200.00,-500.00,-207.801
+4200.00,-475.00,-197.618
+4200.00,-450.00,-187.406
+4200.00,-425.00,-177.164
+4200.00,-400.00,-166.894
+4200.00,-375.00,-156.594
+4200.00,-350.00,-146.265
+4200.00,-325.00,-135.908
+4200.00,-300.00,-125.521
+4200.00,-275.00,-115.106
+4200.00,-250.00,-104.662
+4200.00,-225.00,-94.189
+4200.00,-200.00,-83.687
+4200.00,-175.00,-73.156
+4200.00,-150.00,-62.596
+4200.00,-125.00,-52.007
+4200.00,-100.00,-41.388
+4200.00,-75.00,-30.738
+4200.00,-50.00,-20.051
+4200.00,-25.00,-9.302
+4200.00,-5.00,0.000
+4200.00,5.00,3.358
+4200.00,25.00,12.570
+4200.00,50.00,23.901
+4200.00,75.00,35.238
+4200.00,100.00,46.598
+4200.00,125.00,57.984
+4200.00,150.00,69.398
+4200.00,175.00,80.840
+4200.00,200.00,92.310
+4200.00,225.00,103.808
+4200.00,250.00,115.335
+4200.00,275.00,126.890
+4200.00,300.00,138.473
+4200.00,325.00,150.085
+4200.00,350.00,161.725
+4200.00,375.00,173.394
+4200.00,400.00,185.090
+4200.00,425.00,196.815
+4200.00,450.00,208.568
+4200.00,475.00,220.349
+4200.00,500.00,232.158
+4900.00,-500.00,-241.766
+4900.00,-475.00,-229.931
+4900.00,-450.00,-218.058
+4900.00,-425.00,-206.149
+4900.00,-400.00,-194.204
+4900.00,-375.00,-182.221
+4900.00,-350.00,-170.203
+4900.00,-325.00,-158.148
+4900.00,-300.00,-146.057
+4900.00,-275.00,-133.929
+4900.00,-250.00,-121.765
+4900.00,-225.00,-109.565
+4900.00,-200.00,-97.329
+4900.00,-175.00,-85.056
+4900.00,-150.00,-72.747
+4900.00,-125.00,-60.401
+4900.00,-100.00,-48.017
+4900.00,-75.00,-35.592
+4900.00,-50.00,-23.119
+4900.00,-25.00,-10.552
+4900.00,-5.00,0.000
+4900.00,5.00,4.093
+4900.00,25.00,14.900
+4900.00,50.00,28.132
+4900.00,75.00,41.364
+4900.00,100.00,54.623
+4900.00,125.00,67.914
+4900.00,150.00,81.239
+4900.00,175.00,94.599
+4900.00,200.00,107.995
+4900.00,225.00,121.425
+4900.00,250.00,134.891
+4900.00,275.00,148.393
+4900.00,300.00,161.930
+4900.00,325.00,175.502
+4900.00,350.00,189.110
+4900.00,375.00,202.754
+4900.00,400.00,216.432
+4900.00,425.00,230.146
+4900.00,450.00,243.895
+4900.00,475.00,257.680
+4900.00,500.00,271.499
+5600.00,-500.00,-275.393
+5600.00,-475.00,-261.927
+5600.00,-450.00,-248.415
+5600.00,-425.00,-234.859
+5600.00,-400.00,-221.257
+5600.00,-375.00,-207.610
+5600.00,-350.00,-193.918
+5600.00,-325.00,-180.180
+5600.00,-300.00,-166.399
+5600.00,-275.00,-152.572
+5600.00,-250.00,-138.700
+5600.00,-225.00,-124.784
+5600.00,-200.00,-110.822
+5600.00,-175.00,-96.816
+5600.00,-150.00,-82.764
+5600.00,-125.00,-68.666
+5600.00,-100.00,-54.521
+5600.00,-75.00,-40.324
+5600.00,-50.00,-26.063
+5600.00,-25.00,-11.663
+5600.00,-5.00,0.000
+5600.00,5.00,4.893
+5600.00,25.00,17.326
+5600.00,50.00,32.467
+5600.00,75.00,47.600
+5600.00,100.00,62.763
+5600.00,125.00,77.965
+5600.00,150.00,93.208
+5600.00,175.00,108.494
+5600.00,200.00,123.823
+5600.00,225.00,139.195
+5600.00,250.00,154.611
+5600.00,275.00,170.070
+5600.00,300.00,185.573
+5600.00,325.00,201.120
+5600.00,350.00,216.710
+5600.00,375.00,232.344
+5600.00,400.00,248.021
+5600.00,425.00,263.742
+5600.00,450.00,279.506
+5600.00,475.00,295.313
+5600.00,500.00,311.163
+6300.00,-500.00,-308.664
+6300.00,-475.00,-293.590
+6300.00,-450.00,-278.461
+6300.00,-425.00,-263.277
+6300.00,-400.00,-248.038
+6300.00,-375.00,-232.744
+6300.00,-350.00,-217.395
+6300.00,-325.00,-201.991
+6300.00,-300.00,-186.532
+6300.00,-275.00,-171.019
+6300.00,-250.00,-155.452
+6300.00,-225.00,-139.829
+6300.00,-200.00,-124.152
+6300.00,-175.00,-108.420
+6300.00,-150.00,-92.632
+6300.00,-125.00,-76.788
+6300.00,-100.00,-60.885
+6300.00,-75.00,-44.917
+6300.00,-50.00,-28.864
+6300.00,-25.00,-12.607
+6300.00,-5.00,0.000
+6300.00,5.00,5.759
+6300.00,25.00,19.856
+6300.00,50.00,36.917
+6300.00,75.00,53.958
+6300.00,100.00,71.031
+6300.00,125.00,88.149
+6300.00,150.00,105.317
+6300.00,175.00,122.536
+6300.00,200.00,139.806
+6300.00,225.00,157.130
+6300.00,250.00,174.506
+6300.00,275.00,191.934
+6300.00,300.00,209.416
+6300.00,325.00,226.950
+6300.00,350.00,244.537
+6300.00,375.00,262.177
+6300.00,400.00,279.869
+6300.00,425.00,297.613
+6300.00,450.00,315.410
+6300.00,475.00,333.260
+6300.00,500.00,351.161
+7000.00,-500.00,-341.564
+7000.00,-475.00,-324.906
+7000.00,-450.00,-308.181
+7000.00,-425.00,-291.390
+7000.00,-400.00,-274.532
+7000.00,-375.00,-257.609
+7000.00,-350.00,-240.619
+7000.00,-325.00,-223.564
+7000.00,-300.00,-206.443
+7000.00,-275.00,-189.257
+7000.00,-250.00,-172.005
+7000.00,-225.00,-154.687
+7000.00,-200.00,-137.304
+7000.00,-175.00,-119.854
+7000.00,-150.00,-102.337
+7000.00,-125.00,-84.752
+7000.00,-100.00,-67.094
+7000.00,-75.00,-49.355
+7000.00,-50.00,-31.505
+7000.00,-25.00,-13.354
+7000.00,-5.00,0.000
+7000.00,5.00,6.696
+7000.00,25.00,22.498
+7000.00,50.00,41.493
+7000.00,75.00,60.447
+7000.00,100.00,79.437
+7000.00,125.00,98.478
+7000.00,150.00,117.577
+7000.00,175.00,136.736
+7000.00,200.00,155.957
+7000.00,225.00,175.241
+7000.00,250.00,194.587
+7000.00,275.00,213.997
+7000.00,300.00,233.469
+7000.00,325.00,253.004
+7000.00,350.00,272.602
+7000.00,375.00,292.263
+7000.00,400.00,311.987
+7000.00,425.00,331.773
+7000.00,450.00,351.621
+7000.00,475.00,371.532
+7000.00,500.00,391.505
+7700.00,-500.00,-374.077
+7700.00,-475.00,-355.857
+7700.00,-450.00,-337.558
+7700.00,-425.00,-319.180
+7700.00,-400.00,-300.723
+7700.00,-375.00,-282.189
+7700.00,-350.00,-263.576
+7700.00,-325.00,-244.885
+7700.00,-300.00,-226.116
+7700.00,-275.00,-207.270
+7700.00,-250.00,-188.345
+7700.00,-225.00,-169.343
+7700.00,-200.00,-150.262
+7700.00,-175.00,-131.102
+7700.00,-150.00,-111.863
+7700.00,-125.00,-92.540
+7700.00,-100.00,-73.131
+7700.00,-75.00,-53.620
+7700.00,-50.00,-33.964
+7700.00,-25.00,-13.865
+7700.00,-5.00,0.000
+7700.00,5.00,7.705
+7700.00,25.00,25.259
+7700.00,50.00,46.203
+7700.00,75.00,67.080
+7700.00,100.00,87.992
+7700.00,125.00,108.962
+7700.00,150.00,129.999
+7700.00,175.00,151.107
+7700.00,200.00,172.287
+7700.00,225.00,193.541
+7700.00,250.00,214.868
+7700.00,275.00,236.269
+7700.00,300.00,257.744
+7700.00,325.00,279.294
+7700.00,350.00,300.917
+7700.00,375.00,322.614
+7700.00,400.00,344.385
+7700.00,425.00,366.230
+7700.00,450.00,388.149
+7700.00,475.00,410.140
+7700.00,500.00,432.205
+8400.00,-500.00,-406.186
+8400.00,-475.00,-386.427
+8400.00,-450.00,-366.576
+8400.00,-425.00,-346.632
+8400.00,-400.00,-326.596
+8400.00,-375.00,-306.468
+8400.00,-350.00,-286.249
+8400.00,-325.00,-265.938
+8400.00,-300.00,-245.535
+8400.00,-275.00,-225.042
+8400.00,-250.00,-204.456
+8400.00,-225.00,-183.780
+8400.00,-200.00,-163.011
+8400.00,-175.00,-142.149
+8400.00,-150.00,-121.193
+8400.00,-125.00,-100.139
+8400.00,-100.00,-78.978
+8400.00,-75.00,-57.693
+8400.00,-50.00,-36.218
+8400.00,-25.00,-14.089
+8400.00,-5.00,0.000
+8400.00,5.00,8.787
+8400.00,25.00,28.145
+8400.00,50.00,51.056
+8400.00,75.00,73.865
+8400.00,100.00,96.707
+8400.00,125.00,119.613
+8400.00,150.00,142.596
+8400.00,175.00,165.660
+8400.00,200.00,188.808
+8400.00,225.00,212.040
+8400.00,250.00,235.359
+8400.00,275.00,258.763
+8400.00,300.00,282.253
+8400.00,325.00,305.830
+8400.00,350.00,329.493
+8400.00,375.00,353.242
+8400.00,400.00,377.077
+8400.00,425.00,400.997
+8400.00,450.00,425.004
+8400.00,475.00,449.095
+8400.00,500.00,473.272
+9100.00,-500.00,-437.873
+9100.00,-475.00,-416.599
+9100.00,-450.00,-395.217
+9100.00,-425.00,-373.729
+9100.00,-400.00,-352.133
+9100.00,-375.00,-330.430
+9100.00,-350.00,-308.621
+9100.00,-325.00,-286.706
+9100.00,-300.00,-264.685
+9100.00,-275.00,-242.557
+9100.00,-250.00,-220.323
+9100.00,-225.00,-197.983
+9100.00,-200.00,-175.535
+9100.00,-175.00,-152.979
+9100.00,-150.00,-130.312
+9100.00,-125.00,-107.529
+9100.00,-100.00,-84.619
+9100.00,-75.00,-61.555
+9100.00,-50.00,-38.243
+9100.00,-25.00,-13.957
+9100.00,-5.00,0.000
+9100.00,5.00,9.944
+9100.00,25.00,31.162
+9100.00,50.00,56.061
+9100.00,75.00,80.812
+9100.00,100.00,105.591
+9100.00,125.00,130.441
+9100.00,150.00,155.377
+9100.00,175.00,180.405
+9100.00,200.00,205.529
+9100.00,225.00,230.751
+9100.00,250.00,256.070
+9100.00,275.00,281.489
+9100.00,300.00,307.007
+9100.00,325.00,332.624
+9100.00,350.00,358.341
+9100.00,375.00,384.157
+9100.00,400.00,410.071
+9100.00,425.00,436.085
+9100.00,450.00,462.197
+9100.00,475.00,488.407
+9100.00,500.00,514.716
+9800.00,-500.00,-469.120
+9800.00,-475.00,-446.355
+9800.00,-450.00,-423.466
+9800.00,-425.00,-400.454
+9800.00,-400.00,-377.318
+9800.00,-375.00,-354.059
+9800.00,-350.00,-330.678
+9800.00,-325.00,-307.174
+9800.00,-300.00,-283.548
+9800.00,-275.00,-259.800
+9800.00,-250.00,-235.929
+9800.00,-225.00,-211.936
+9800.00,-200.00,-187.818
+9800.00,-175.00,-163.575
+9800.00,-150.00,-139.202
+9800.00,-125.00,-114.693
+9800.00,-100.00,-90.033
+9800.00,-75.00,-65.184
+9800.00,-50.00,-40.009
+9800.00,-25.00,-13.364
+9800.00,-5.00,0.000
+9800.00,5.00,11.178
+9800.00,25.00,34.315
+9800.00,50.00,61.225
+9800.00,75.00,87.931
+9800.00,100.00,114.656
+9800.00,125.00,141.457
+9800.00,150.00,168.354
+9800.00,175.00,195.354
+9800.00,200.00,222.463
+9800.00,225.00,249.683
+9800.00,250.00,277.015
+9800.00,275.00,304.459
+9800.00,300.00,332.017
+9800.00,325.00,359.688
+9800.00,350.00,387.472
+9800.00,375.00,415.369
+9800.00,400.00,443.380
+9800.00,425.00,471.503
+9800.00,450.00,499.738
+9800.00,475.00,528.087
+9800.00,500.00,556.547
+10500.00,-500.00,-499.911
+10500.00,-475.00,-475.678
+10500.00,-450.00,-451.305
+10500.00,-425.00,-426.790
+10500.00,-400.00,-402.134
+10500.00,-375.00,-377.338
+10500.00,-350.00,-352.401
+10500.00,-325.00,-327.325
+10500.00,-300.00,-302.109
+10500.00,-275.00,-276.754
+10500.00,-250.00,-251.258
+10500.00,-225.00,-225.621
+10500.00,-200.00,-199.842
+10500.00,-175.00,-173.919
+10500.00,-150.00,-147.845
+10500.00,-125.00,-121.613
+10500.00,-100.00,-95.201
+10500.00,-75.00,-68.556
+10500.00,-50.00,-41.483
+10500.00,-25.00,-12.133
+10500.00,-5.00,0.000
+10500.00,5.00,12.488
+10500.00,25.00,37.610
+10500.00,50.00,66.556
+10500.00,75.00,95.229
+10500.00,100.00,123.910
+10500.00,125.00,152.671
+10500.00,150.00,181.536
+10500.00,175.00,210.517
+10500.00,200.00,239.620
+10500.00,225.00,268.848
+10500.00,250.00,298.202
+10500.00,275.00,327.683
+10500.00,300.00,357.293
+10500.00,325.00,387.030
+10500.00,350.00,416.896
+10500.00,375.00,446.890
+10500.00,400.00,477.012
+10500.00,425.00,507.262
+10500.00,450.00,537.639
+10500.00,475.00,568.143
+10500.00,500.00,598.775
+11200.00,-500.00,-530.225
+11200.00,-475.00,-504.550
+11200.00,-450.00,-478.714
+11200.00,-425.00,-452.719
+11200.00,-400.00,-426.563
+11200.00,-375.00,-400.248
+11200.00,-350.00,-373.774
+11200.00,-325.00,-347.142
+11200.00,-300.00,-320.351
+11200.00,-275.00,-293.401
+11200.00,-250.00,-266.292
+11200.00,-225.00,-239.022
+11200.00,-200.00,-211.591
+11200.00,-175.00,-183.993
+11200.00,-150.00,-156.224
+11200.00,-125.00,-128.269
+11200.00,-100.00,-100.101
+11200.00,-75.00,-71.647
+11200.00,-50.00,-42.629
+11200.00,-25.00,-9.884
+11200.00,-5.00,0.000
+11200.00,5.00,13.876
+11200.00,25.00,41.050
+11200.00,50.00,72.061
+11200.00,75.00,102.715
+11200.00,100.00,133.363
+11200.00,125.00,164.092
+11200.00,150.00,194.934
+11200.00,175.00,225.905
+11200.00,200.00,257.011
+11200.00,225.00,288.256
+11200.00,250.00,319.643
+11200.00,275.00,351.172
+11200.00,300.00,382.846
+11200.00,325.00,414.663
+11200.00,350.00,446.624
+11200.00,375.00,478.730
+11200.00,400.00,510.979
+11200.00,425.00,543.372
+11200.00,450.00,575.908
+11200.00,475.00,608.587
+11200.00,500.00,641.409
+11900.00,-500.00,-560.044
+11900.00,-475.00,-532.952
+11900.00,-450.00,-505.677
+11900.00,-425.00,-478.222
+11900.00,-400.00,-450.587
+11900.00,-375.00,-422.773
+11900.00,-350.00,-394.779
+11900.00,-325.00,-366.607
+11900.00,-300.00,-338.255
+11900.00,-275.00,-309.724
+11900.00,-250.00,-281.013
+11900.00,-225.00,-252.121
+11900.00,-200.00,-223.045
+11900.00,-175.00,-193.780
+11900.00,-150.00,-164.318
+11900.00,-125.00,-134.641
+11900.00,-100.00,-104.711
+11900.00,-75.00,-74.428
+11900.00,-50.00,-43.401
+11900.00,-25.00,-5.199
+11900.00,-5.00,0.000
+11900.00,5.00,15.343
+11900.00,25.00,44.640
+11900.00,50.00,77.745
+11900.00,75.00,110.397
+11900.00,100.00,143.023
+11900.00,125.00,175.729
+11900.00,150.00,208.558
+11900.00,175.00,241.526
+11900.00,200.00,274.644
+11900.00,225.00,307.917
+11900.00,250.00,341.347
+11900.00,275.00,374.936
+11900.00,300.00,408.686
+11900.00,325.00,442.596
+11900.00,350.00,476.667
+11900.00,375.00,510.898
+11900.00,400.00,545.291
+11900.00,425.00,579.843
+11900.00,450.00,614.556
+11900.00,475.00,649.428
+11900.00,500.00,684.459
+12600.00,-500.00,-589.350
+12600.00,-475.00,-560.863
+12600.00,-450.00,-532.174
+12600.00,-425.00,-503.282
+12600.00,-400.00,-474.189
+12600.00,-375.00,-444.894
+12600.00,-350.00,-415.398
+12600.00,-325.00,-385.701
+12600.00,-300.00,-355.804
+12600.00,-275.00,-325.705
+12600.00,-250.00,-295.404
+12600.00,-225.00,-264.899
+12600.00,-200.00,-234.186
+12600.00,-175.00,-203.259
+12600.00,-150.00,-172.107
+12600.00,-125.00,-140.706
+12600.00,-100.00,-109.006
+12600.00,-75.00,-76.869
+12600.00,-50.00,-43.743
+12600.00,-25.00,0.000
+12600.00,-5.00,0.000
+12600.00,5.00,16.889
+12600.00,25.00,48.382
+12600.00,50.00,83.615
+12600.00,75.00,118.283
+12600.00,100.00,152.897
+12600.00,125.00,187.592
+12600.00,150.00,222.415
+12600.00,175.00,257.391
+12600.00,200.00,292.531
+12600.00,225.00,327.841
+12600.00,250.00,363.326
+12600.00,275.00,398.986
+12600.00,300.00,434.824
+12600.00,325.00,470.839
+12600.00,350.00,507.033
+12600.00,375.00,543.406
+12600.00,400.00,579.957
+12600.00,425.00,616.685
+12600.00,450.00,653.591
+12600.00,475.00,690.675
+12600.00,500.00,727.935
+13300.00,-500.00,-618.120
+13300.00,-475.00,-588.266
+13300.00,-450.00,-558.186
+13300.00,-425.00,-527.879
+13300.00,-400.00,-497.348
+13300.00,-375.00,-466.591
+13300.00,-350.00,-435.611
+13300.00,-325.00,-404.407
+13300.00,-300.00,-372.978
+13300.00,-275.00,-341.325
+13300.00,-250.00,-309.445
+13300.00,-225.00,-277.337
+13300.00,-200.00,-244.995
+13300.00,-175.00,-212.411
+13300.00,-150.00,-179.570
+13300.00,-125.00,-146.442
+13300.00,-100.00,-112.959
+13300.00,-75.00,-78.934
+13300.00,-50.00,-43.586
+13300.00,-25.00,0.000
+13300.00,-5.00,0.000
+13300.00,5.00,18.513
+13300.00,25.00,52.279
+13300.00,50.00,89.676
+13300.00,75.00,126.379
+13300.00,100.00,162.996
+13300.00,125.00,199.688
+13300.00,150.00,236.517
+13300.00,175.00,273.510
+13300.00,200.00,310.681
+13300.00,225.00,348.039
+13300.00,250.00,385.588
+13300.00,275.00,423.330
+13300.00,300.00,461.268
+13300.00,325.00,499.403
+13300.00,350.00,537.734
+13300.00,375.00,576.262
+13300.00,400.00,614.986
+13300.00,425.00,653.908
+13300.00,450.00,693.025
+13300.00,475.00,732.338
+13300.00,500.00,771.846
+14000.00,-500.00,-646.335
+14000.00,-475.00,-615.139
+14000.00,-450.00,-583.692
+14000.00,-425.00,-551.993
+14000.00,-400.00,-520.045
+14000.00,-375.00,-487.847
+14000.00,-350.00,-455.400
+14000.00,-325.00,-422.704
+14000.00,-300.00,-389.760
+14000.00,-275.00,-356.565
+14000.00,-250.00,-323.118
+14000.00,-225.00,-289.415
+14000.00,-200.00,-255.451
+14000.00,-175.00,-221.214
+14000.00,-150.00,-186.685
+14000.00,-125.00,-151.824
+14000.00,-100.00,-116.541
+14000.00,-75.00,-80.585
+14000.00,-50.00,-42.840
+14000.00,-25.00,0.000
+14000.00,-5.00,0.000
+14000.00,5.00,20.218
+14000.00,25.00,56.335
+14000.00,50.00,95.934
+14000.00,75.00,134.691
+14000.00,100.00,173.325
+14000.00,125.00,212.027
+14000.00,150.00,250.871
+14000.00,175.00,289.890
+14000.00,200.00,329.103
+14000.00,225.00,368.518
+14000.00,250.00,408.143
+14000.00,275.00,447.979
+14000.00,300.00,488.030
+14000.00,325.00,528.296
+14000.00,350.00,568.778
+14000.00,375.00,609.476
+14000.00,400.00,650.390
+14000.00,425.00,691.520
+14000.00,450.00,732.865
+14000.00,475.00,774.425
+14000.00,500.00,816.200
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_drag.vemd
new file mode 100644
index 0000000000..f8e7de4075
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_drag.vemd
@@ -0,0 +1,24 @@
+n [rpm] , T_drag [Nm]
+0, -0.92
+70, -0.97
+700, -1.46
+1400, -2.01
+2100, -2.55
+2800, -3.09
+3500, -3.64
+4200, -4.18
+4900, -4.73
+5600, -5.27
+6300, -5.81
+7000, -6.36
+7700, -6.9
+8400, -7.44
+9100, -7.99
+9800, -8.53
+10500, -9.08
+11200, -9.62
+11900, -10.16
+12600, -10.71
+13300, -11.25
+14000, -11.79
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_fld.vemp
new file mode 100644
index 0000000000..887e24ce6c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/EM_fld.vemp
@@ -0,0 +1,25 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 500.00, -500.00
+70, 500.00, -500.00
+700, 500.00, -500.00
+1400, 500.00, -500.00
+2100, 500.00, -500.00
+2800, 500.00, -500.00
+3500, 500.00, -500.00
+4200, 416.67, -416.67
+4900, 357.14, -357.14
+5600, 312.50, -312.50
+6300, 277.78, -277.78
+7000, 250.00, -250.00
+7700, 227.27, -227.27
+8400, 208.33, -208.33
+9100, 192.31, -192.31
+9800, 178.57, -178.57
+10500, 166.67, -166.67
+11200, 156.25, -156.25
+11900, 147.06, -147.06
+12600, 138.89, -138.89
+13300, 131.58, -131.58
+14000, 125.00, -125.00
+
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_Map.vemo b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_Map.vemo
new file mode 100644
index 0000000000..2cc4c71621
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_Map.vemo
@@ -0,0 +1,379 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-1030.00,0.000
+0.00,-978.50,0.000
+0.00,-927.00,0.000
+0.00,-875.50,0.000
+0.00,-824.00,0.000
+0.00,-772.50,0.000
+0.00,-721.00,-0.220
+0.00,-669.50,-0.510
+0.00,-618.00,-0.671
+0.00,-566.50,-0.765
+0.00,-515.00,-0.813
+0.00,-463.50,-0.826
+0.00,-412.00,-0.811
+0.00,-360.50,-0.771
+0.00,-309.00,-0.710
+0.00,-257.50,-0.629
+0.00,-206.00,-0.531
+0.00,-154.50,-0.416
+0.00,-103.00,-0.287
+0.00,-51.50,-0.143
+0.00,-10.30,-0.015
+0.00,10.30,0.059
+0.00,51.50,0.264
+0.00,103.00,0.527
+0.00,154.50,0.800
+0.00,206.00,1.080
+0.00,257.50,1.370
+0.00,309.00,1.667
+0.00,360.50,1.972
+0.00,412.00,2.285
+0.00,463.50,2.606
+0.00,515.00,2.935
+0.00,566.50,3.270
+0.00,618.00,3.613
+0.00,669.50,3.964
+0.00,721.00,4.321
+0.00,772.50,4.685
+0.00,824.00,5.056
+0.00,875.50,5.433
+0.00,927.00,5.818
+0.00,978.50,6.209
+0.00,1030.00,6.606
+37.00,-1030.00,0.000
+37.00,-978.50,0.000
+37.00,-927.00,0.000
+37.00,-875.50,0.000
+37.00,-824.00,0.000
+37.00,-772.50,0.000
+37.00,-721.00,-0.447
+37.00,-669.50,-0.678
+37.00,-618.00,-0.798
+37.00,-566.50,-0.860
+37.00,-515.00,-0.883
+37.00,-463.50,-0.876
+37.00,-412.00,-0.845
+37.00,-360.50,-0.792
+37.00,-309.00,-0.721
+37.00,-257.50,-0.633
+37.00,-206.00,-0.530
+37.00,-154.50,-0.413
+37.00,-103.00,-0.283
+37.00,-51.50,-0.141
+37.00,-10.30,-0.015
+37.00,10.30,0.055
+37.00,51.50,0.248
+37.00,103.00,0.495
+37.00,154.50,0.749
+37.00,206.00,1.011
+37.00,257.50,1.280
+37.00,309.00,1.556
+37.00,360.50,1.840
+37.00,412.00,2.129
+37.00,463.50,2.426
+37.00,515.00,2.729
+37.00,566.50,3.039
+37.00,618.00,3.355
+37.00,669.50,3.677
+37.00,721.00,4.005
+37.00,772.50,4.340
+37.00,824.00,4.680
+37.00,875.50,5.026
+37.00,927.00,5.378
+37.00,978.50,5.735
+37.00,1030.00,6.098
+370.00,-1030.00,-36.344
+370.00,-978.50,-34.617
+370.00,-927.00,-32.881
+370.00,-875.50,-31.134
+370.00,-824.00,-29.376
+370.00,-772.50,-27.609
+370.00,-721.00,-25.831
+370.00,-669.50,-24.043
+370.00,-618.00,-22.244
+370.00,-566.50,-20.436
+370.00,-515.00,-18.617
+370.00,-463.50,-16.789
+370.00,-412.00,-14.950
+370.00,-360.50,-13.102
+370.00,-309.00,-11.244
+370.00,-257.50,-9.375
+370.00,-206.00,-7.497
+370.00,-154.50,-5.609
+370.00,-103.00,-3.711
+370.00,-51.50,-1.802
+370.00,-10.30,-0.248
+370.00,10.30,0.515
+370.00,51.50,2.185
+370.00,103.00,4.271
+370.00,154.50,6.366
+370.00,206.00,8.470
+370.00,257.50,10.584
+370.00,309.00,12.707
+370.00,360.50,14.839
+370.00,412.00,16.982
+370.00,463.50,19.133
+370.00,515.00,21.294
+370.00,566.50,23.465
+370.00,618.00,25.644
+370.00,669.50,27.833
+370.00,721.00,30.032
+370.00,772.50,32.239
+370.00,824.00,34.456
+370.00,875.50,36.682
+370.00,927.00,38.918
+370.00,978.50,41.162
+370.00,1030.00,43.415
+740.00,-1030.00,-74.961
+740.00,-978.50,-71.312
+740.00,-927.00,-67.651
+740.00,-875.50,-63.979
+740.00,-824.00,-60.294
+740.00,-772.50,-56.597
+740.00,-721.00,-52.889
+740.00,-669.50,-49.169
+740.00,-618.00,-45.436
+740.00,-566.50,-41.693
+740.00,-515.00,-37.937
+740.00,-463.50,-34.170
+740.00,-412.00,-30.391
+740.00,-360.50,-26.600
+740.00,-309.00,-22.798
+740.00,-257.50,-18.984
+740.00,-206.00,-15.158
+740.00,-154.50,-11.321
+740.00,-103.00,-7.471
+740.00,-51.50,-3.607
+740.00,-10.30,-0.452
+740.00,10.30,1.051
+740.00,51.50,4.367
+740.00,103.00,8.495
+740.00,154.50,12.632
+740.00,206.00,16.780
+740.00,257.50,20.940
+740.00,309.00,25.111
+740.00,360.50,29.294
+740.00,412.00,33.488
+740.00,463.50,37.693
+740.00,515.00,41.910
+740.00,566.50,46.139
+740.00,618.00,50.379
+740.00,669.50,54.630
+740.00,721.00,58.893
+740.00,772.50,63.167
+740.00,824.00,67.452
+740.00,875.50,71.749
+740.00,927.00,76.057
+740.00,978.50,80.377
+740.00,1030.00,84.707
+1110.00,-1030.00,-113.264
+1110.00,-978.50,-107.719
+1110.00,-927.00,-102.159
+1110.00,-875.50,-96.584
+1110.00,-824.00,-90.994
+1110.00,-772.50,-85.390
+1110.00,-721.00,-79.770
+1110.00,-669.50,-74.136
+1110.00,-618.00,-68.486
+1110.00,-566.50,-62.822
+1110.00,-515.00,-57.144
+1110.00,-463.50,-51.450
+1110.00,-412.00,-45.742
+1110.00,-360.50,-40.018
+1110.00,-309.00,-34.281
+1110.00,-257.50,-28.528
+1110.00,-206.00,-22.760
+1110.00,-154.50,-16.978
+1110.00,-103.00,-11.179
+1110.00,-51.50,-5.359
+1110.00,-10.30,-0.563
+1110.00,10.30,1.626
+1110.00,51.50,6.595
+1110.00,103.00,12.768
+1110.00,154.50,18.951
+1110.00,206.00,25.148
+1110.00,257.50,31.359
+1110.00,309.00,37.584
+1110.00,360.50,43.824
+1110.00,412.00,50.078
+1110.00,463.50,56.347
+1110.00,515.00,62.631
+1110.00,566.50,68.929
+1110.00,618.00,75.242
+1110.00,669.50,81.569
+1110.00,721.00,87.911
+1110.00,772.50,94.268
+1110.00,824.00,100.638
+1110.00,875.50,107.024
+1110.00,927.00,113.423
+1110.00,978.50,119.838
+1110.00,1030.00,126.266
+1480.00,-1030.00,-151.257
+1480.00,-978.50,-143.841
+1480.00,-927.00,-136.405
+1480.00,-875.50,-128.950
+1480.00,-824.00,-121.475
+1480.00,-772.50,-113.982
+1480.00,-721.00,-106.469
+1480.00,-669.50,-98.937
+1480.00,-618.00,-91.386
+1480.00,-566.50,-83.815
+1480.00,-515.00,-76.226
+1480.00,-463.50,-68.618
+1480.00,-412.00,-60.990
+1480.00,-360.50,-53.344
+1480.00,-309.00,-45.678
+1480.00,-257.50,-37.993
+1480.00,-206.00,-30.289
+1480.00,-154.50,-22.565
+1480.00,-103.00,-14.819
+1480.00,-51.50,-7.042
+1480.00,-10.30,-0.493
+1480.00,10.30,2.246
+1480.00,51.50,8.883
+1480.00,103.00,17.106
+1480.00,154.50,25.338
+1480.00,206.00,33.588
+1480.00,257.50,41.855
+1480.00,309.00,50.141
+1480.00,360.50,58.446
+1480.00,412.00,66.770
+1480.00,463.50,75.112
+1480.00,515.00,83.474
+1480.00,566.50,91.854
+1480.00,618.00,100.253
+1480.00,669.50,108.671
+1480.00,721.00,117.108
+1480.00,772.50,125.563
+1480.00,824.00,134.038
+1480.00,875.50,142.531
+1480.00,927.00,151.043
+1480.00,978.50,159.573
+1480.00,1030.00,168.122
+1850.00,-1030.00,-188.930
+1850.00,-978.50,-179.665
+1850.00,-927.00,-170.376
+1850.00,-875.50,-161.062
+1850.00,-824.00,-151.723
+1850.00,-772.50,-142.360
+1850.00,-721.00,-132.971
+1850.00,-669.50,-123.558
+1850.00,-618.00,-114.120
+1850.00,-566.50,-104.657
+1850.00,-515.00,-95.170
+1850.00,-463.50,-85.659
+1850.00,-412.00,-76.122
+1850.00,-360.50,-66.561
+1850.00,-309.00,-56.976
+1850.00,-257.50,-47.365
+1850.00,-206.00,-37.729
+1850.00,-154.50,-28.067
+1850.00,-103.00,-18.376
+1850.00,-51.50,-8.638
+1850.00,-10.30,0.000
+1850.00,10.30,2.921
+1850.00,51.50,11.243
+1850.00,103.00,21.520
+1850.00,154.50,31.807
+1850.00,206.00,42.113
+1850.00,257.50,52.443
+1850.00,309.00,62.797
+1850.00,360.50,73.174
+1850.00,412.00,83.576
+1850.00,463.50,94.003
+1850.00,515.00,104.453
+1850.00,566.50,114.928
+1850.00,618.00,125.427
+1850.00,669.50,135.950
+1850.00,721.00,146.498
+1850.00,772.50,157.070
+1850.00,824.00,167.666
+1850.00,875.50,178.286
+1850.00,927.00,188.931
+1850.00,978.50,199.599
+1850.00,1030.00,210.291
+2220.00,-1030.00,-226.266
+2220.00,-978.50,-215.178
+2220.00,-927.00,-204.058
+2220.00,-875.50,-192.907
+2220.00,-824.00,-181.723
+2220.00,-772.50,-170.509
+2220.00,-721.00,-159.262
+2220.00,-669.50,-147.984
+2220.00,-618.00,-136.675
+2220.00,-566.50,-125.334
+2220.00,-515.00,-113.962
+2220.00,-463.50,-102.558
+2220.00,-412.00,-91.123
+2220.00,-360.50,-79.656
+2220.00,-309.00,-68.158
+2220.00,-257.50,-56.628
+2220.00,-206.00,-45.066
+2220.00,-154.50,-33.469
+2220.00,-103.00,-21.833
+2220.00,-51.50,-10.128
+2220.00,-10.30,0.000
+2220.00,10.30,3.656
+2220.00,51.50,13.687
+2220.00,103.00,26.025
+2220.00,154.50,38.369
+2220.00,206.00,50.739
+2220.00,257.50,63.137
+2220.00,309.00,75.565
+2220.00,360.50,88.023
+2220.00,412.00,100.512
+2220.00,463.50,113.032
+2220.00,515.00,125.583
+2220.00,566.50,138.165
+2220.00,618.00,150.778
+2220.00,669.50,163.421
+2220.00,721.00,176.096
+2220.00,772.50,188.801
+2220.00,824.00,201.537
+2220.00,875.50,214.304
+2220.00,927.00,227.101
+2220.00,978.50,239.929
+2220.00,1030.00,252.787
+2590.00,-1030.00,-263.249
+2590.00,-978.50,-250.362
+2590.00,-927.00,-237.434
+2590.00,-875.50,-224.467
+2590.00,-824.00,-211.460
+2590.00,-772.50,-198.413
+2590.00,-721.00,-185.327
+2590.00,-669.50,-172.200
+2590.00,-618.00,-159.035
+2590.00,-566.50,-145.830
+2590.00,-515.00,-132.585
+2590.00,-463.50,-119.301
+2590.00,-412.00,-105.977
+2590.00,-360.50,-92.614
+2590.00,-309.00,-79.211
+2590.00,-257.50,-65.768
+2590.00,-206.00,-52.283
+2590.00,-154.50,-38.755
+2590.00,-103.00,-25.173
+2590.00,-51.50,-11.490
+2590.00,-10.30,0.000
+2590.00,10.30,4.457
+2590.00,51.50,16.224
+2590.00,103.00,30.631
+2590.00,154.50,45.039
+2590.00,206.00,59.477
+2590.00,257.50,73.949
+2590.00,309.00,88.458
+2590.00,360.50,103.005
+2590.00,412.00,117.591
+2590.00,463.50,132.215
+2590.00,515.00,146.877
+2590.00,566.50,161.579
+2590.00,618.00,176.319
+2590.00,669.50,191.097
+2590.00,721.00,205.914
+2590.00,772.50,220.770
+2590.00,824.00,235.664
+2590.00,875.50,250.596
+2590.00,927.00,265.567
+2590.00,978.50,280.576
+2590.00,1030.00,295.623
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_drag.vemd b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_drag.vemd
new file mode 100644
index 0000000000..314a3b4215
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_drag.vemd
@@ -0,0 +1,11 @@
+n [rpm] , T_drag [Nm]
+0, -1.89
+37, -2.01
+370, -3.02
+740, -4.14
+1110, -5.26
+1480, -6.38
+1850, -7.5
+2220, -8.62
+2590, -9.74
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_fld.vemp b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_fld.vemp
new file mode 100644
index 0000000000..d7a681028a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Gen_fld.vemp
@@ -0,0 +1,13 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 1030.00, -1030.00
+37, 1030.00, -1030.00
+370, 1030.00, -1030.00
+740, 1030.00, -1030.00
+1110, 1030.00, -1030.00
+1480, 1030.00, -1030.00
+1850, 1030.00, -1030.00
+2220, 858.33, -858.33
+2590, 735.71, -735.71
+
+
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vbatr b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vbatr
new file mode 100644
index 0000000000..a6939be42a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0,  0.024
+100,  0.024
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vreess b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vreess
new file mode 100644
index 0000000000..79f41df321
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericBattery.vreess
@@ -0,0 +1,19 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-06-16T09:37:48.3166199Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "REESSType": "Battery",
+    "Model": "Generic Battery",
+    "Capacity": 68.75,
+    "SOC_min": 20,
+    "SOC_max": 80,
+    "MaxCurrentMap": "MaxCurrent.vimax",
+    "InternalResistanceCurve": "GenericBattery.vbatr",
+    "SoCCurve": "REESS_SOC_curve.vbatv"
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericEM.vem b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericEM.vem
new file mode 100644
index 0000000000..8c2a244b02
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericEM.vem
@@ -0,0 +1,33 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-08-05T14:49:40.5920495Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Electric Motor",
+    "Inertia": 0.134,
+    "ContinuousTorque": 437,
+    "ContinuousTorqueSpeed": 3500,
+    "OverloadTorque": 500,
+    "OverloadTorqueSpeed": 3500,
+    "OverloadTime": 120,
+    "ThermalOverloadRecoveryFactor": 0.9,
+    "VoltageLevels": [
+      {
+        "Voltage": 0.0,
+        "FullLoadCurve": "EM_fld.vemp",
+        "DragCurve": "EM_drag.vemd",
+        "EfficiencyMap": "EM_Map.vemo"
+      },
+      {
+        "Voltage": 1000.0,
+        "FullLoadCurve": "EM_fld.vemp",
+        "DragCurve": "EM_drag.vemd",
+        "EfficiencyMap": "EM_Map.vemo"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericGen.vem b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericGen.vem
new file mode 100644
index 0000000000..8bce454f0f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/GenericGen.vem
@@ -0,0 +1,33 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2021-08-05T14:49:40.5920495Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "Model": "Generic Electric Motor",
+    "Inertia": 0.134,
+    "ContinuousTorque": 798,
+    "ContinuousTorqueSpeed": 1850,
+    "OverloadTorque": 1030,
+    "OverloadTorqueSpeed": 1850,
+    "OverloadTime": 120,
+    "ThermalOverloadRecoveryFactor": 0.9,
+    "VoltageLevels": [
+      {
+        "Voltage": 0.0,
+        "FullLoadCurve": "Gen_fld.vemp",
+        "DragCurve": "Gen_drag.vemd",
+        "EfficiencyMap": "Gen_Map.vemo"
+      },
+      {
+        "Voltage": 1000.0,
+        "FullLoadCurve": "Gen_fld.vemp",
+        "DragCurve": "Gen_drag.vemd",
+        "EfficiencyMap": "Gen_Map.vemo"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000..2f2ed814fc
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Hybrid_Parameters.vhctl
@@ -0,0 +1,18 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-09-07T15:28:08.3781385Z",
+    "AppVersion": "3",
+    "FileVersion": 2
+  },
+  "Body": {
+    "----EquivalenceFactor": 2.0,
+    "MinSoC": 24.0,
+    "----MaxSoC": 80.0,
+    "TargetSoC": 70.0,
+    "----AuxBufferTime": 5.0,
+    "----AuxBufferChgTime": 5.0,
+    "----MinICEOnTime": 10.0,
+    "GensetMinOptPowerFactor": 0.2 
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/LongHaul_short.vdri b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/LongHaul_short.vdri
new file mode 100644
index 0000000000..4147227803
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/LongHaul_short.vdri
@@ -0,0 +1,12 @@
+<s>,<v>,<grad>,<stop>
+0,0,2.95016969027809,2
+1,60,2.95016969027809,0
+2,60,2.95016969027809,0
+3,60,2.95016969027809,0
+4,60,2.95016969027809,0
+5,60,2.95016969027809,0
+6,60,2.95016969027809,0
+7,60,2.95016969027809,0
+8,60,2.95016969027809,0
+9,60,3.06801369027809,0
+10,60,3.06801369027809,0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/MaxCurrent.vimax
new file mode 100644
index 0000000000..adf28fb9b5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/REESS_SOC_curve.vbatv
new file mode 100644
index 0000000000..745afc9500
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/REESS_SOC_curve.vbatv
@@ -0,0 +1,13 @@
+SOC, V
+0,718.4170472
+10,746.8408459
+20,763.1375469
+30,771.851826
+40,776.2574768
+50,778.6145358
+60,780.4264075
+70,782.6969898
+80,786.1877986
+90,791.6750932
+100,800.2070015
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Retarder.vrlm
new file mode 100644
index 0000000000..ce9f4b123a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Retarder.vrlm
@@ -0,0 +1,25 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10.02
+200,10.08
+300,10.18
+400,10.32
+500,10.5
+600,10.72
+700,10.98
+800,11.28
+900,11.62
+1000,12
+1100,12.42
+1200,12.88
+1300,13.38
+1400,13.92
+1500,14.5
+1600,15.12
+1700,15.78
+1800,16.48
+1900,17.22
+2000,18
+2100,18.82
+2200,19.68
+2300,20.58
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vecto
new file mode 100644
index 0000000000..a705030ab3
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vecto
@@ -0,0 +1,52 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-04-12T11:56:29.7214541Z",
+    "AppVersion": "3",
+    "FileVersion": 11
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehicleFile": "S3WithAxlegearInputRetarder.vveh",
+    "GearboxFile": "Axle.vgbx",
+    "EngineOnlyMode": false,
+    "EngineFile": "209kW_7c7l.veng",
+    "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+    "Padd": 0.0,
+    "Paux_ICEOff_Driving": 0.0,
+    "Paux_ICEOff_Standstill": 0.0,
+    "Padd_electric": 0.0,
+    "VACC": "Truck.vacc",
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EngineStopStartUtilityFactorDriving": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
+    "LAC": {
+      "Enabled": true,
+      "PreviewDistanceFactor": 10.0,
+      "DF_offset": 2.5,
+      "DF_scaling": 1.5,
+      "DF_targetSpeedLookup": "",
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
+    },
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 2.5
+    },
+    "Cycles": [
+      "LongHaul_short.vdri"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
new file mode 100644
index 0000000000..d6448dac8d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithAxlegearInputRetarder.vveh
@@ -0,0 +1,97 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-04-12T11:44:48.1352806Z",
+    "AppVersion": "3",
+    "FileVersion": 10
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehCat": "CityBus",
+    "LegislativeClass": "Unknown",
+    "CurbWeight": 12841.5,
+    "CurbWeightExtra": 0.0,
+    "MassMax": 19.5,
+    "Loading": 5618.16,
+    "rdyn": 465.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "AxleConfig": {
+      "Type": "4x2",
+      "Axles": [
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.375,
+          "TwinTyres": false,
+          "RRCISO": 0.0034,
+          "FzISO": 31300.0,
+          "Type": "VehicleNonDriven"
+        },
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.625,
+          "TwinTyres": true,
+          "RRCISO": 0.004,
+          "FzISO": 31300.0,
+          "Type": "VehicleDriven"
+        }
+      ]
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "Option_1_2_3",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.9,
+    "VehicleHeight": 3.1,
+    "IdlingSpeed": 0.0,
+    "Retarder": {
+      "Type": "None",
+      "Ratio": 1.0,
+      "File": ""
+    },
+    "Angledrive": {
+      "Type": "None",
+      "Ratio": "NaN",
+      "LossMap": ""
+    },
+    "PTO": {
+      "Type": "None",
+      "LossMap": "",
+      "Cycle": "",
+      "CycleDriving": ""
+    },
+    "TorqueLimits": {},
+    "InitialSoC": 80.0,
+    "PowertrainConfiguration": "SerialHybrid",
+    "ElectricMotors": [
+      {
+        "Count": 2,
+        "Ratio": 12.47,
+        "Position": "E3",
+        "MotorFile": "GenericEM.vem",
+        "MechanicalEfficiency": 0.98
+      },
+      {
+        "Count": 1,
+        "Ratio": 1.0,
+        "Position": "GEN",
+        "MotorFile": "GenericGen.vem",
+        "MechanicalEfficiency": 1.0
+      }
+    ],
+    "Batteries": [
+      {
+        "NumPacks": 1,
+        "BatteryFile": "GenericBattery.vreess",
+        "StreamId": 0
+      }
+    ],
+    "Retarder": {
+      "Type": "AxlegearInputRetarder",
+      "Ratio": 1.0,
+      "File": "Retarder.vrlm"
+    }
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vecto
new file mode 100644
index 0000000000..4bb6e0b70f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vecto
@@ -0,0 +1,51 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-04-12T11:56:29.7214541Z",
+    "AppVersion": "3",
+    "FileVersion": 11
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehicleFile": "S3WithoutAxlegearInputRetarder.vveh",
+    "GearboxFile": "Axle.vgbx",
+    "EngineFile": "209kW_7c7l.veng",
+    "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+    "Padd": 0.0,
+    "Paux_ICEOff_Driving": 0.0,
+    "Paux_ICEOff_Standstill": 0.0,
+    "Padd_electric": 0.0,
+    "VACC": "Truck.vacc",
+    "EngineStopStartAtVehicleStopThreshold": 2.0,
+    "EngineStopStartMaxOffTimespan": 120.0,
+    "EngineStopStartUtilityFactor": 0.8,
+    "EngineStopStartUtilityFactorDriving": 0.8,
+    "EcoRollMinSpeed": 60.000000000000007,
+    "EcoRollActivationDelay": 2.0,
+    "EcoRollUnderspeedThreshold": 0.0,
+    "EcoRollMaxAcceleration": 0.1,
+    "PCCEnableSpeed": 80.0,
+    "PCCMinSpeed": 50.0,
+    "PCCUnderspeed": 8.0,
+    "PCCOverSpeed": 5.0,
+    "PCCPreviewDistanceUC1": 1500.0,
+    "PCCPreviewDistanceUC2": 1000.0,
+    "LAC": {
+      "Enabled": true,
+      "PreviewDistanceFactor": 10.0,
+      "DF_offset": 2.5,
+      "DF_scaling": 1.5,
+      "DF_targetSpeedLookup": "",
+      "Df_velocityDropLookup": "",
+      "MinSpeed": 50.0
+    },
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 2.5
+    },
+    "Cycles": [
+      "LongHaul_short.vdri"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
new file mode 100644
index 0000000000..a60756a243
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/S3WithoutAxlegearInputRetarder.vveh
@@ -0,0 +1,92 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2022-04-12T11:44:48.1352806Z",
+    "AppVersion": "3",
+    "FileVersion": 10
+  },
+  "Body": {
+    "SavedInDeclMode": false,
+    "VehCat": "CityBus",
+    "LegislativeClass": "Unknown",
+    "CurbWeight": 12841.5,
+    "CurbWeightExtra": 0.0,
+    "MassMax": 19.5,
+    "Loading": 5618.16,
+    "rdyn": 465.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "AxleConfig": {
+      "Type": "4x2",
+      "Axles": [
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.375,
+          "TwinTyres": false,
+          "RRCISO": 0.0034,
+          "FzISO": 31300.0,
+          "Type": "VehicleNonDriven"
+        },
+        {
+          "Inertia": 11.9,
+          "Wheels": "275/70 R22.5",
+          "AxleWeightShare": 0.625,
+          "TwinTyres": true,
+          "RRCISO": 0.004,
+          "FzISO": 31300.0,
+          "Type": "VehicleDriven"
+        }
+      ]
+    },
+    "EngineStopStart": false,
+    "EcoRoll": "None",
+    "PredictiveCruiseControl": "Option_1_2_3",
+    "ATEcoRollReleaseLockupClutch": false,
+    "CdA": 4.9,
+    "VehicleHeight": 3.1,
+    "IdlingSpeed": 0.0,
+    "Retarder": {
+      "Type": "None",
+      "Ratio": 1.0,
+      "File": ""
+    },
+    "Angledrive": {
+      "Type": "None",
+      "Ratio": "NaN",
+      "LossMap": ""
+    },
+    "PTO": {
+      "Type": "None",
+      "LossMap": "",
+      "Cycle": "",
+      "CycleDriving": ""
+    },
+    "TorqueLimits": {},
+    "InitialSoC": 80.0,
+    "PowertrainConfiguration": "SerialHybrid",
+    "ElectricMotors": [
+      {
+        "Count": 2,
+        "Ratio": 12.47,
+        "Position": "E3",
+        "MotorFile": "GenericEM.vem",
+        "MechanicalEfficiency": 0.98
+      },
+      {
+        "Count": 1,
+        "Ratio": 1.0,
+        "Position": "GEN",
+        "MotorFile": "GenericGen.vem",
+        "MechanicalEfficiency": 1.0
+      }
+    ],
+    "Batteries": [
+      {
+        "NumPacks": 1,
+        "BatteryFile": "GenericBattery.vreess",
+        "StreamId": 0
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Truck.vacc
similarity index 62%
rename from VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Truck.vacc
index 54e7786487..b03ec7e47e 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/P3/Truck.vacc
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/S3/Truck.vacc
@@ -1,4 +1,4 @@
-v [km/h],acc [m/s²],dec [m/s²]
+v [km/h],acc [m/s�],dec [m/s�]
 0,1,-1
 25,1,-1
 50,0.642857143,-1
-- 
GitLab