diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 3b812fb659ec50ca4981439c61315be572397484..117120d6f5fa576ef21e453ac8c3322190a68ce2 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -48,6 +48,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
protected const string BEV_E2_Job_BusAux = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_BusAux.vecto";
protected const string BEV_E2_Job_Cont30kW = @"TestData\BatteryElectric\GenericVehicleB2\BEV_ENG_Cont30kW.vecto";
+ protected const string BEV_E2_APTN_Job = @"TestData\BatteryElectric\GenericVehicleB2_APTN\BEV_B2_Group5LH_rl_APTN.vecto";
+
+
public const string MotorFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericEMotor_125kW_485Nm.vem";
public const string BatFile = @"TestData\BatteryElectric\GenericVehicleB4\GenericBattery_243kWh_750V.vbat";
@@ -660,7 +663,16 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
TestCase(BEV_E2_Job_Cont30kW, 7, TestName = "PEV E2 Cont. 30kW Job Suburban"),
TestCase(BEV_E2_Job_Cont30kW, 8, TestName = "PEV E2 Cont. 30kW Job Urban"),
TestCase(BEV_E2_Job_Cont30kW, 9, TestName = "PEV E2 Cont. 30kW Job UrbanDelivery"),
- //TestCase(BEV_Job_Cont30kW, 0, TestName = "PEV E2 Job Cont. 80kW RD")
+ //TestCase(BEV_Job_Cont30kW, 0, TestName = "PEV E2 Job Cont. 80kW RD")
+
+ TestCase(BEV_E2_APTN_Job, 0, TestName = "PEV E2 APT-N Job LongHaul"),
+ TestCase(BEV_E2_APTN_Job, 1, TestName = "PEV E2 APT-N Job RegionalDelivery"),
+ TestCase(BEV_E2_APTN_Job, 2, TestName = "PEV E2 APT-N Job UrbanDelivery"),
+ TestCase(BEV_E2_APTN_Job, 3, TestName = "PEV E2 APT-N Job Construction"),
+ TestCase(BEV_E2_APTN_Job, 4, TestName = "PEV E2 APT-N Job Urban"),
+ TestCase(BEV_E2_APTN_Job, 5, TestName = "PEV E2 APT-N Job Suburban"),
+ TestCase(BEV_E2_APTN_Job, 6, TestName = "PEV E2 APT-N Job Interurban"),
+ TestCase(BEV_E2_APTN_Job, 7, TestName = "PEV E2 APT-N Job Coach"),
]
public void B2PEVRunJob(string jobFile, int cycleIdx)
{
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
index ea867eac8bfe0213a604042346e3a06011636ee0..a3c3d2d5a33ca9f629ae411d1406d25aa9a96aa7 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/SerialHybridTest.cs
@@ -78,14 +78,14 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
TestCase(@"TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vecto", 7, TestName = "Generic Serial Hybrid S2 AMT 12speed Job, Coach"),
]
[
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
- TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN_PCC\HEV_S2_Group5LH_rl_APTN.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 0, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, LongHaul"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 1, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, RegionalDelivery"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 2, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, UrbanDelivery"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 3, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Construction"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 4, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Urban"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 5, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Suburban"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 6, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Interurban"),
+ TestCase(@"TestData\Hybrids\GenericVehicle_S2_APTN\HEV_S2_Group5LH_rl_APTN.vecto", 7, TestName = "Generic Serial Hybrid S2 APT-N 3speed Job, Coach"),
]
public void S2SerialHybridJob(string jobFile, int runIdx)
{
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/3speedAPT-N.vgbx b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/3speedAPT-N.vgbx
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/3speedAPT-N.vgbx
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/3speedAPT-N.vgbx
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Axle_4x2_LH.vtlm b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Axle_4x2_LH.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Axle_4x2_LH.vtlm
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Axle_4x2_LH.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5LH_rl_APTN.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5LH_rl_APTN.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..6cb60090e7bde20267b20bbd056775c33d586456
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5LH_rl_APTN.vecto
@@ -0,0 +1,57 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-12-17T13:29:45.3314877Z",
+ "AppVersion": "3",
+ "FileVersion": 9
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehicleFile": "BEV_B2_Group5_LH_rl.vveh",
+ "EngineFile": "209kW_7c7l.veng",
+ "GearboxFile": "3speedAPT-N.vgbx",
+ "TCU": "3speedAPT-N.vgbx",
+ "HybridStrategyParams": "Hybrid_Parameters.vhctl",
+ "Padd_electric": 0.0,
+ "---BusAux": "xEV_Aux.vaux",
+ "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",
+ "RegionalDelivery",
+ "UrbanDelivery",
+ "Construction",
+ "Urban",
+ "Suburban",
+ "Interurban",
+ "Coach"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..caf96e7215ebe59d0818720b872139ca6066834c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
@@ -0,0 +1,104 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-12-17T13:29:44.1894088Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 10143.4,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300.0,
+ "rdyn": 492.20000000000005,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 1.0,
+ "File": ""
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0034,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.004,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 37500.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 37500.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 37500.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": false,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.31,
+ "VehicleHeight": 4.0,
+ "InitialSoC": 70,
+ "PowertrainConfiguration": "BatteryElectric",
+ "ElectricMotors": [
+ {
+ "Count": 2,
+ "Ratio": 1.0,
+ "Position": "E2",
+ "MotorFile": "BEV_Group5_EM.vem",
+ "MechanicalEfficiency": 1.0
+ }
+ ],
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "BEV_Group5_REESS.vreess",
+ "StreamId": 0
+ },
+ {
+ "NumPacks": 1,
+ "BatteryFile": "BEV_Group5_REESS.vreess",
+ "StreamId": 1
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_EM.vem b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_EM.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_EM.vem
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_EM.vem
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_REESS.vreess b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_REESS.vreess
new file mode 100644
index 0000000000000000000000000000000000000000..938edb1d5e03c953c64af05851d1172d55918a05
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/BEV_Group5_REESS.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": 300,
+ "SOC_min": 20,
+ "SOC_max": 80,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_PEV_800V.vbatr",
+ "SoCCurve": "REESS_SOC_curve.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_Map.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_Map.vemo
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_Map.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_drag.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_drag.vemd
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_drag.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_fld.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/EM_fld.vemp
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/EM_fld.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gear_indirect.vtlm b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Gear_indirect.vtlm
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gear_indirect.vtlm
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Gear_indirect.vtlm
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatr b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/GenericBattery_PEV_800V.vbatr
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatr
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/GenericBattery_PEV_800V.vbatr
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatv b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/GenericBattery_PEV_800V.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbatv
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/GenericBattery_PEV_800V.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Hybrid_Parameters.vhctl
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Hybrid_Parameters.vhctl
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Hybrid_Parameters.vhctl
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/MaxCurrent.vimax
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/MaxCurrent.vimax
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/MaxCurrent.vimax
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/NoCompressor.ACMP b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/NoCompressor.ACMP
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/NoCompressor.ACMP
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/NoCompressor.ACMP
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/REESS_SOC_curve.vbatv
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/REESS_SOC_curve.vbatv
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/REESS_SOC_curve.vbatv
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/ShiftParameters.vtcu
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/ShiftParameters.vtcu
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/ShiftParameters.vtcu
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Truck.vacc b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Truck.vacc
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Truck.vacc
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/Truck.vacc
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/xEV_Aux.vaux b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/xEV_Aux.vaux
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/xEV_Aux.vaux
rename to VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2_APTN/xEV_Aux.vaux
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_7c7l.veng
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_7c7l.veng
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_7c7l.veng
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_Map.vmap b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_Map.vmap
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_Map.vmap
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_Map.vmap
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_fld.vfld b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_fld.vfld
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/209kW_ICE_fld.vfld
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/209kW_ICE_fld.vfld
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/3speedAPT-N.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/3speedAPT-N.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..8197eb08b14b24ba950f2b205caab544990268cd
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/3speedAPT-N.vgbx
@@ -0,0 +1,54 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-12-13T10:08:24.0568805Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "3_speed_APT-N",
+ "Inertia": 0.0,
+ "TracInt": 0.1,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2_LH.vtlm"
+ },
+ {
+ "Ratio": 8.31,
+ "LossMap": "Gear_indirect.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.65,
+ "LossMap": "Gear_indirect.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.75,
+ "LossMap": "Gear_indirect.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.8,
+ "GearboxType": "APTN",
+ "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/Hybrids/GenericVehicle_S2_APTN/Axle_4x2_LH.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Axle_4x2_LH.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..6b2e07e765296de3803c71694f65e7a793adcbe4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Axle_4x2_LH.vtlm
@@ -0,0 +1,11 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-50000,1500
+0,-200,6
+0,0,6
+0,200,6
+0,50000,1500
+5000,-50000,1500
+5000,-1253,37.5
+5000,0,37.5
+5000,1253,37.5
+5000,50000,1500
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_EM.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_EM.vem
new file mode 100644
index 0000000000000000000000000000000000000000..dd52e5d44541a5146b39326ba1cba1c7738fbb40
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_EM.vem
@@ -0,0 +1,22 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-17T14:26:41.1270692Z",
+ "AppVersion": "3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Electric Motor",
+ "FullLoadCurve": "EM_fld.vemp",
+ "DragCurve": "EM_drag.vemd",
+ "EfficiencyMap": "EM_Map.vemo",
+ "Inertia": 0.5,
+ "ContinuousTorque": 750,
+ "ContinuousTorqueSpeed": 2069.01426019464,
+ "OverloadTorque": 750,
+ "OverloadTorqueSpeed": 2069.01426019464,
+ "OverloadTime": 120,
+ "ThermalOverloadRecoveryFactor": 0.9
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_REESS.vreess b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_REESS.vreess
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/BEV_Group5_REESS.vreess
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/BEV_Group5_REESS.vreess
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_Map.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..d899ca8fc0736ae6aa161db1034807f6fdc66f53
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_Map.vemo
@@ -0,0 +1,925 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-750.00,0.000
+0.00,-712.50,0.000
+0.00,-675.00,0.000
+0.00,-637.50,0.000
+0.00,-600.00,0.000
+0.00,-562.50,0.000
+0.00,-525.00,-0.065
+0.00,-487.50,-0.329
+0.00,-450.00,-0.491
+0.00,-412.50,-0.597
+0.00,-375.00,-0.661
+0.00,-337.50,-0.692
+0.00,-300.00,-0.695
+0.00,-262.50,-0.674
+0.00,-225.00,-0.630
+0.00,-187.50,-0.566
+0.00,-150.00,-0.483
+0.00,-112.50,-0.383
+0.00,-75.00,-0.266
+0.00,-37.50,-0.133
+0.00,-7.50,-0.012
+0.00,7.50,0.063
+0.00,37.50,0.276
+0.00,75.00,0.552
+0.00,112.50,0.839
+0.00,150.00,1.136
+0.00,187.50,1.444
+0.00,225.00,1.763
+0.00,262.50,2.092
+0.00,300.00,2.430
+0.00,337.50,2.779
+0.00,375.00,3.137
+0.00,412.50,3.505
+0.00,450.00,3.882
+0.00,487.50,4.269
+0.00,525.00,4.665
+0.00,562.50,5.070
+0.00,600.00,5.483
+0.00,637.50,5.906
+0.00,675.00,6.338
+0.00,712.50,6.778
+0.00,750.00,7.227
+41.38,-750.00,0.000
+41.38,-712.50,0.000
+41.38,-675.00,0.000
+41.38,-637.50,0.000
+41.38,-600.00,0.000
+41.38,-562.50,0.000
+41.38,-525.00,-0.252
+41.38,-487.50,-0.422
+41.38,-450.00,-0.521
+41.38,-412.50,-0.581
+41.38,-375.00,-0.611
+41.38,-337.50,-0.618
+41.38,-300.00,-0.606
+41.38,-262.50,-0.576
+41.38,-225.00,-0.530
+41.38,-187.50,-0.471
+41.38,-150.00,-0.398
+41.38,-112.50,-0.312
+41.38,-75.00,-0.215
+41.38,-37.50,-0.107
+41.38,-7.50,-0.010
+41.38,7.50,0.048
+41.38,37.50,0.211
+41.38,75.00,0.421
+41.38,112.50,0.638
+41.38,150.00,0.863
+41.38,187.50,1.096
+41.38,225.00,1.336
+41.38,262.50,1.583
+41.38,300.00,1.837
+41.38,337.50,2.098
+41.38,375.00,2.366
+41.38,412.50,2.641
+41.38,450.00,2.923
+41.38,487.50,3.211
+41.38,525.00,3.505
+41.38,562.50,3.807
+41.38,600.00,4.114
+41.38,637.50,4.428
+41.38,675.00,4.748
+41.38,712.50,5.074
+41.38,750.00,5.406
+413.80,-750.00,-29.048
+413.80,-712.50,-27.683
+413.80,-675.00,-26.308
+413.80,-637.50,-24.923
+413.80,-600.00,-23.528
+413.80,-562.50,-22.123
+413.80,-525.00,-20.708
+413.80,-487.50,-19.284
+413.80,-450.00,-17.850
+413.80,-412.50,-16.406
+413.80,-375.00,-14.952
+413.80,-337.50,-13.489
+413.80,-300.00,-12.016
+413.80,-262.50,-10.534
+413.80,-225.00,-9.042
+413.80,-187.50,-7.540
+413.80,-150.00,-6.029
+413.80,-112.50,-4.509
+413.80,-75.00,-2.978
+413.80,-37.50,-1.438
+413.80,-7.50,-0.184
+413.80,7.50,0.441
+413.80,37.50,1.812
+413.80,75.00,3.525
+413.80,112.50,5.248
+413.80,150.00,6.980
+413.80,187.50,8.721
+413.80,225.00,10.472
+413.80,262.50,12.232
+413.80,300.00,14.001
+413.80,337.50,15.780
+413.80,375.00,17.568
+413.80,412.50,19.365
+413.80,450.00,21.172
+413.80,487.50,22.988
+413.80,525.00,24.813
+413.80,562.50,26.647
+413.80,600.00,28.491
+413.80,637.50,30.344
+413.80,675.00,32.205
+413.80,712.50,34.076
+413.80,750.00,35.956
+827.61,-750.00,-60.284
+827.61,-712.50,-57.365
+827.61,-675.00,-54.435
+827.61,-637.50,-51.494
+827.61,-600.00,-48.541
+827.61,-562.50,-45.576
+827.61,-525.00,-42.600
+827.61,-487.50,-39.613
+827.61,-450.00,-36.614
+827.61,-412.50,-33.604
+827.61,-375.00,-30.583
+827.61,-337.50,-27.550
+827.61,-300.00,-24.506
+827.61,-262.50,-21.451
+827.61,-225.00,-18.384
+827.61,-187.50,-15.307
+827.61,-150.00,-12.217
+827.61,-112.50,-9.117
+827.61,-75.00,-6.004
+827.61,-37.50,-2.878
+827.61,-7.50,-0.329
+827.61,7.50,0.905
+827.61,37.50,3.621
+827.61,75.00,7.004
+827.61,112.50,10.398
+827.61,150.00,13.802
+827.61,187.50,17.218
+827.61,225.00,20.645
+827.61,262.50,24.083
+827.61,300.00,27.533
+827.61,337.50,30.993
+827.61,375.00,34.466
+827.61,412.50,37.949
+827.61,450.00,41.444
+827.61,487.50,44.950
+827.61,525.00,48.468
+827.61,562.50,51.996
+827.61,600.00,55.536
+827.61,637.50,59.087
+827.61,675.00,62.649
+827.61,712.50,66.223
+827.61,750.00,69.807
+1241.41,-750.00,-91.220
+1241.41,-712.50,-86.773
+1241.41,-675.00,-82.312
+1241.41,-637.50,-77.836
+1241.41,-600.00,-73.346
+1241.41,-562.50,-68.842
+1241.41,-525.00,-64.323
+1241.41,-487.50,-59.790
+1241.41,-450.00,-55.243
+1241.41,-412.50,-50.681
+1241.41,-375.00,-46.105
+1241.41,-337.50,-41.514
+1241.41,-300.00,-36.910
+1241.41,-262.50,-32.291
+1241.41,-225.00,-27.657
+1241.41,-187.50,-23.010
+1241.41,-150.00,-18.348
+1241.41,-112.50,-13.671
+1241.41,-75.00,-8.980
+1241.41,-37.50,-4.269
+1241.41,-7.50,-0.394
+1241.41,7.50,1.407
+1241.41,37.50,5.476
+1241.41,75.00,10.533
+1241.41,112.50,15.600
+1241.41,150.00,20.681
+1241.41,187.50,25.776
+1241.41,225.00,30.886
+1241.41,262.50,36.009
+1241.41,300.00,41.148
+1241.41,337.50,46.300
+1241.41,375.00,51.467
+1241.41,412.50,56.649
+1241.41,450.00,61.844
+1241.41,487.50,67.054
+1241.41,525.00,72.279
+1241.41,562.50,77.518
+1241.41,600.00,82.771
+1241.41,637.50,88.038
+1241.41,675.00,93.320
+1241.41,712.50,98.616
+1241.41,750.00,103.926
+1655.21,-750.00,-121.857
+1655.21,-712.50,-115.906
+1655.21,-675.00,-109.935
+1655.21,-637.50,-103.947
+1655.21,-600.00,-97.940
+1655.21,-562.50,-91.914
+1655.21,-525.00,-85.869
+1655.21,-487.50,-79.806
+1655.21,-450.00,-73.725
+1655.21,-412.50,-67.625
+1655.21,-375.00,-61.506
+1655.21,-337.50,-55.369
+1655.21,-300.00,-49.214
+1655.21,-262.50,-43.040
+1655.21,-225.00,-36.848
+1655.21,-187.50,-30.637
+1655.21,-150.00,-24.408
+1655.21,-112.50,-18.159
+1655.21,-75.00,-11.890
+1655.21,-37.50,-5.593
+1655.21,-7.50,-0.317
+1655.21,7.50,1.959
+1655.21,37.50,7.391
+1655.21,75.00,14.124
+1655.21,112.50,20.869
+1655.21,150.00,27.631
+1655.21,187.50,34.411
+1655.21,225.00,41.210
+1655.21,262.50,48.027
+1655.21,300.00,54.862
+1655.21,337.50,61.716
+1655.21,375.00,68.589
+1655.21,412.50,75.481
+1655.21,450.00,82.391
+1655.21,487.50,89.319
+1655.21,525.00,96.266
+1655.21,562.50,103.232
+1655.21,600.00,110.216
+1655.21,637.50,117.219
+1655.21,675.00,124.240
+1655.21,712.50,131.280
+1655.21,750.00,138.338
+2069.01,-750.00,-152.184
+2069.01,-712.50,-144.751
+2069.01,-675.00,-137.294
+2069.01,-637.50,-129.813
+2069.01,-600.00,-122.307
+2069.01,-562.50,-114.778
+2069.01,-525.00,-107.225
+2069.01,-487.50,-99.648
+2069.01,-450.00,-92.048
+2069.01,-412.50,-84.423
+2069.01,-375.00,-76.774
+2069.01,-337.50,-69.102
+2069.01,-300.00,-61.406
+2069.01,-262.50,-53.686
+2069.01,-225.00,-45.942
+2069.01,-187.50,-38.174
+2069.01,-150.00,-30.382
+2069.01,-112.50,-22.565
+2069.01,-75.00,-14.720
+2069.01,-37.50,-6.835
+2069.01,-7.50,0.000
+2069.01,7.50,2.567
+2069.01,37.50,9.378
+2069.01,75.00,17.792
+2069.01,112.50,26.219
+2069.01,150.00,34.666
+2069.01,187.50,43.137
+2069.01,225.00,51.631
+2069.01,262.50,60.149
+2069.01,300.00,68.690
+2069.01,337.50,77.256
+2069.01,375.00,85.846
+2069.01,412.50,94.460
+2069.01,450.00,103.097
+2069.01,487.50,111.759
+2069.01,525.00,120.445
+2069.01,562.50,129.154
+2069.01,600.00,137.887
+2069.01,637.50,146.645
+2069.01,675.00,155.426
+2069.01,712.50,164.230
+2069.01,750.00,173.059
+2482.82,-750.00,-182.186
+2482.82,-712.50,-173.294
+2482.82,-675.00,-164.372
+2482.82,-637.50,-155.419
+2482.82,-600.00,-146.436
+2482.82,-562.50,-137.422
+2482.82,-525.00,-128.377
+2482.82,-487.50,-119.302
+2482.82,-450.00,-110.197
+2482.82,-412.50,-101.061
+2482.82,-375.00,-91.894
+2482.82,-337.50,-82.698
+2482.82,-300.00,-73.471
+2482.82,-262.50,-64.213
+2482.82,-225.00,-54.925
+2482.82,-187.50,-45.606
+2482.82,-150.00,-36.256
+2482.82,-112.50,-26.874
+2482.82,-75.00,-17.455
+2482.82,-37.50,-7.976
+2482.82,-7.50,0.000
+2482.82,7.50,3.240
+2482.82,37.50,11.448
+2482.82,75.00,21.549
+2482.82,112.50,31.662
+2482.82,150.00,41.800
+2482.82,187.50,51.966
+2482.82,225.00,62.163
+2482.82,262.50,72.389
+2482.82,300.00,82.646
+2482.82,337.50,92.933
+2482.82,375.00,103.251
+2482.82,412.50,113.600
+2482.82,450.00,123.978
+2482.82,487.50,134.388
+2482.82,525.00,144.827
+2482.82,562.50,155.298
+2482.82,600.00,165.798
+2482.82,637.50,176.329
+2482.82,675.00,186.890
+2482.82,712.50,197.482
+2482.82,750.00,208.103
+2896.62,-750.00,-211.847
+2896.62,-712.50,-201.521
+2896.62,-675.00,-191.155
+2896.62,-637.50,-180.752
+2896.62,-600.00,-170.309
+2896.62,-562.50,-159.829
+2896.62,-525.00,-149.310
+2896.62,-487.50,-138.753
+2896.62,-450.00,-128.157
+2896.62,-412.50,-117.524
+2896.62,-375.00,-106.852
+2896.62,-337.50,-96.142
+2896.62,-300.00,-85.394
+2896.62,-262.50,-74.607
+2896.62,-225.00,-63.783
+2896.62,-187.50,-52.919
+2896.62,-150.00,-42.016
+2896.62,-112.50,-31.071
+2896.62,-75.00,-20.078
+2896.62,-37.50,-8.998
+2896.62,-7.50,0.000
+2896.62,7.50,3.985
+2896.62,37.50,13.614
+2896.62,75.00,25.409
+2896.62,112.50,37.211
+2896.62,150.00,49.045
+2896.62,187.50,60.913
+2896.62,225.00,72.819
+2896.62,262.50,84.762
+2896.62,300.00,96.743
+2896.62,337.50,108.762
+2896.62,375.00,120.819
+2896.62,412.50,132.914
+2896.62,450.00,145.047
+2896.62,487.50,157.219
+2896.62,525.00,169.429
+2896.62,562.50,181.676
+2896.62,600.00,193.962
+2896.62,637.50,206.285
+2896.62,675.00,218.647
+2896.62,712.50,231.046
+2896.62,750.00,243.483
+3310.42,-750.00,-241.153
+3310.42,-712.50,-229.414
+3310.42,-675.00,-217.628
+3310.42,-637.50,-205.794
+3310.42,-600.00,-193.913
+3310.42,-562.50,-181.984
+3310.42,-525.00,-170.008
+3310.42,-487.50,-157.985
+3310.42,-450.00,-145.914
+3310.42,-412.50,-133.797
+3310.42,-375.00,-121.632
+3310.42,-337.50,-109.420
+3310.42,-300.00,-97.160
+3310.42,-262.50,-84.854
+3310.42,-225.00,-72.499
+3310.42,-187.50,-60.097
+3310.42,-150.00,-47.645
+3310.42,-112.50,-35.140
+3310.42,-75.00,-22.572
+3310.42,-37.50,-9.879
+3310.42,-7.50,0.000
+3310.42,7.50,4.806
+3310.42,37.50,15.885
+3310.42,75.00,29.382
+3310.42,112.50,42.881
+3310.42,150.00,56.414
+3310.42,187.50,69.991
+3310.42,225.00,83.612
+3310.42,262.50,97.280
+3310.42,300.00,110.994
+3310.42,337.50,124.754
+3310.42,375.00,138.562
+3310.42,412.50,152.416
+3310.42,450.00,166.318
+3310.42,487.50,180.266
+3310.42,525.00,194.261
+3310.42,562.50,208.303
+3310.42,600.00,222.391
+3310.42,637.50,236.527
+3310.42,675.00,250.709
+3310.42,712.50,264.937
+3310.42,750.00,279.212
+3724.23,-750.00,-270.086
+3724.23,-712.50,-256.959
+3724.23,-675.00,-243.775
+3724.23,-637.50,-230.532
+3724.23,-600.00,-217.232
+3724.23,-562.50,-203.873
+3724.23,-525.00,-190.458
+3724.23,-487.50,-176.984
+3724.23,-450.00,-163.453
+3724.23,-412.50,-149.865
+3724.23,-375.00,-136.219
+3724.23,-337.50,-122.516
+3724.23,-300.00,-108.756
+3724.23,-262.50,-94.937
+3724.23,-225.00,-81.061
+3724.23,-187.50,-67.125
+3724.23,-150.00,-53.128
+3724.23,-112.50,-39.065
+3724.23,-75.00,-24.920
+3724.23,-37.50,-10.594
+3724.23,-7.50,0.000
+3724.23,7.50,5.709
+3724.23,37.50,18.273
+3724.23,75.00,33.481
+3724.23,112.50,48.682
+3724.23,150.00,63.922
+3724.23,187.50,79.212
+3724.23,225.00,94.556
+3724.23,262.50,109.956
+3724.23,300.00,125.412
+3724.23,337.50,140.924
+3724.23,375.00,156.494
+3724.23,412.50,172.119
+3724.23,450.00,187.802
+3724.23,487.50,203.541
+3724.23,525.00,219.338
+3724.23,562.50,235.190
+3724.23,600.00,251.100
+3724.23,637.50,267.066
+3724.23,675.00,283.088
+3724.23,712.50,299.167
+3724.23,750.00,315.302
+4138.03,-750.00,-298.631
+4138.03,-712.50,-284.140
+4138.03,-675.00,-269.579
+4138.03,-637.50,-254.949
+4138.03,-600.00,-240.249
+4138.03,-562.50,-225.480
+4138.03,-525.00,-210.642
+4138.03,-487.50,-195.735
+4138.03,-450.00,-180.758
+4138.03,-412.50,-165.713
+4138.03,-375.00,-150.599
+4138.03,-337.50,-135.416
+4138.03,-300.00,-120.164
+4138.03,-262.50,-104.842
+4138.03,-225.00,-89.450
+4138.03,-187.50,-73.987
+4138.03,-150.00,-58.449
+4138.03,-112.50,-42.830
+4138.03,-75.00,-27.103
+4138.03,-37.50,-11.115
+4138.03,-7.50,0.000
+4138.03,7.50,6.698
+4138.03,37.50,20.785
+4138.03,75.00,37.717
+4138.03,112.50,54.626
+4138.03,150.00,71.579
+4138.03,187.50,88.590
+4138.03,225.00,105.664
+4138.03,262.50,122.804
+4138.03,300.00,140.011
+4138.03,337.50,157.285
+4138.03,375.00,174.627
+4138.03,412.50,192.036
+4138.03,450.00,209.514
+4138.03,487.50,227.059
+4138.03,525.00,244.671
+4138.03,562.50,262.352
+4138.03,600.00,280.100
+4138.03,637.50,297.915
+4138.03,675.00,315.798
+4138.03,712.50,333.748
+4138.03,750.00,351.765
+4551.83,-750.00,-326.770
+4551.83,-712.50,-310.939
+4551.83,-675.00,-295.025
+4551.83,-637.50,-279.028
+4551.83,-600.00,-262.949
+4551.83,-562.50,-246.788
+4551.83,-525.00,-230.545
+4551.83,-487.50,-214.220
+4551.83,-450.00,-197.814
+4551.83,-412.50,-181.325
+4551.83,-375.00,-164.755
+4551.83,-337.50,-148.104
+4551.83,-300.00,-131.370
+4551.83,-262.50,-114.553
+4551.83,-225.00,-97.653
+4551.83,-187.50,-80.668
+4551.83,-150.00,-63.592
+4551.83,-112.50,-46.415
+4551.83,-75.00,-29.101
+4551.83,-37.50,-11.408
+4551.83,-7.50,0.000
+4551.83,7.50,7.777
+4551.83,37.50,23.431
+4551.83,75.00,42.101
+4551.83,112.50,60.727
+4551.83,150.00,79.399
+4551.83,187.50,98.137
+4551.83,225.00,116.948
+4551.83,262.50,135.837
+4551.83,300.00,154.803
+4551.83,337.50,173.849
+4551.83,375.00,192.975
+4551.83,412.50,212.180
+4551.83,450.00,231.465
+4551.83,487.50,250.830
+4551.83,525.00,270.275
+4551.83,562.50,289.799
+4551.83,600.00,309.403
+4551.83,637.50,329.087
+4551.83,675.00,348.849
+4551.83,712.50,368.692
+4551.83,750.00,388.613
+4965.63,-750.00,-354.487
+4965.63,-712.50,-337.340
+4965.63,-675.00,-320.095
+4965.63,-637.50,-302.754
+4965.63,-600.00,-285.316
+4965.63,-562.50,-267.782
+4965.63,-525.00,-250.152
+4965.63,-487.50,-232.426
+4965.63,-450.00,-214.604
+4965.63,-412.50,-196.686
+4965.63,-375.00,-178.673
+4965.63,-337.50,-160.563
+4965.63,-300.00,-142.357
+4965.63,-262.50,-124.054
+4965.63,-225.00,-105.653
+4965.63,-187.50,-87.149
+4965.63,-150.00,-68.538
+4965.63,-112.50,-49.804
+4965.63,-75.00,-30.892
+4965.63,-37.50,-11.429
+4965.63,-7.50,0.000
+4965.63,7.50,8.948
+4965.63,37.50,26.219
+4965.63,75.00,46.643
+4965.63,112.50,66.994
+4965.63,150.00,87.392
+4965.63,187.50,107.864
+4965.63,225.00,128.421
+4965.63,262.50,149.066
+4965.63,300.00,169.802
+4965.63,337.50,190.630
+4965.63,375.00,211.550
+4965.63,412.50,232.563
+4965.63,450.00,253.669
+4965.63,487.50,274.868
+4965.63,525.00,296.160
+4965.63,562.50,317.545
+4965.63,600.00,339.023
+4965.63,637.50,360.593
+4965.63,675.00,382.256
+4965.63,712.50,404.010
+4965.63,750.00,425.858
+5379.44,-750.00,-381.765
+5379.44,-712.50,-363.325
+5379.44,-675.00,-344.773
+5379.44,-637.50,-326.109
+5379.44,-600.00,-307.333
+5379.44,-562.50,-288.445
+5379.44,-525.00,-269.445
+5379.44,-487.50,-250.334
+5379.44,-450.00,-231.112
+5379.44,-412.50,-211.779
+5379.44,-375.00,-192.335
+5379.44,-337.50,-172.778
+5379.44,-300.00,-153.110
+5379.44,-262.50,-133.329
+5379.44,-225.00,-113.432
+5379.44,-187.50,-93.416
+5379.44,-150.00,-73.271
+5379.44,-112.50,-52.976
+5379.44,-75.00,-32.452
+5379.44,-37.50,-11.121
+5379.44,-7.50,0.000
+5379.44,7.50,10.215
+5379.44,37.50,29.156
+5379.44,75.00,51.354
+5379.44,112.50,73.440
+5379.44,150.00,95.571
+5379.44,187.50,117.785
+5379.44,225.00,140.094
+5379.44,262.50,162.504
+5379.44,300.00,185.018
+5379.44,337.50,207.638
+5379.44,375.00,230.365
+5379.44,412.50,253.198
+5379.44,450.00,276.138
+5379.44,487.50,299.186
+5379.44,525.00,322.340
+5379.44,562.50,345.602
+5379.44,600.00,368.971
+5379.44,637.50,392.446
+5379.44,675.00,416.028
+5379.44,712.50,439.716
+5379.44,750.00,463.511
+5793.24,-750.00,-408.585
+5793.24,-712.50,-388.878
+5793.24,-675.00,-369.042
+5793.24,-637.50,-349.077
+5793.24,-600.00,-328.982
+5793.24,-562.50,-308.760
+5793.24,-525.00,-288.409
+5793.24,-487.50,-267.930
+5793.24,-450.00,-247.323
+5793.24,-412.50,-226.588
+5793.24,-375.00,-205.725
+5793.24,-337.50,-184.733
+5793.24,-300.00,-163.612
+5793.24,-262.50,-142.360
+5793.24,-225.00,-120.974
+5793.24,-187.50,-99.448
+5793.24,-150.00,-77.771
+5793.24,-112.50,-55.910
+5793.24,-75.00,-33.754
+5793.24,-37.50,-10.401
+5793.24,-7.50,0.000
+5793.24,7.50,11.581
+5793.24,37.50,32.250
+5793.24,75.00,56.242
+5793.24,112.50,80.074
+5793.24,150.00,103.947
+5793.24,187.50,127.910
+5793.24,225.00,151.980
+5793.24,262.50,176.163
+5793.24,300.00,200.466
+5793.24,337.50,224.888
+5793.24,375.00,249.431
+5793.24,412.50,274.097
+5793.24,450.00,298.885
+5793.24,487.50,323.795
+5793.24,525.00,348.827
+5793.24,562.50,373.982
+5793.24,600.00,399.259
+5793.24,637.50,424.658
+5793.24,675.00,450.178
+5793.24,712.50,475.821
+5793.24,750.00,501.584
+6207.04,-750.00,-434.931
+6207.04,-712.50,-413.981
+6207.04,-675.00,-392.884
+6207.04,-637.50,-371.640
+6207.04,-600.00,-350.248
+6207.04,-562.50,-328.710
+6207.04,-525.00,-307.026
+6207.04,-487.50,-285.195
+6207.04,-450.00,-263.218
+6207.04,-412.50,-241.095
+6207.04,-375.00,-218.826
+6207.04,-337.50,-196.410
+6207.04,-300.00,-173.845
+6207.04,-262.50,-151.130
+6207.04,-225.00,-128.261
+6207.04,-187.50,-105.229
+6207.04,-150.00,-82.019
+6207.04,-112.50,-58.585
+6207.04,-75.00,-34.770
+6207.04,-37.50,-9.135
+6207.04,-7.50,0.000
+6207.04,7.50,13.048
+6207.04,37.50,35.508
+6207.04,75.00,61.316
+6207.04,112.50,86.907
+6207.04,150.00,112.531
+6207.04,187.50,138.251
+6207.04,225.00,164.090
+6207.04,262.50,190.056
+6207.04,300.00,216.155
+6207.04,337.50,242.390
+6207.04,375.00,268.762
+6207.04,412.50,295.272
+6207.04,450.00,321.920
+6207.04,487.50,348.707
+6207.04,525.00,375.632
+6207.04,562.50,402.696
+6207.04,600.00,429.899
+6207.04,637.50,457.240
+6207.04,675.00,484.718
+6207.04,712.50,512.335
+6207.04,750.00,540.089
+6620.85,-750.00,-460.782
+6620.85,-712.50,-438.615
+6620.85,-675.00,-416.281
+6620.85,-637.50,-393.780
+6620.85,-600.00,-371.112
+6620.85,-562.50,-348.278
+6620.85,-525.00,-325.278
+6620.85,-487.50,-302.113
+6620.85,-450.00,-278.782
+6620.85,-412.50,-255.285
+6620.85,-375.00,-231.621
+6620.85,-337.50,-207.791
+6620.85,-300.00,-183.792
+6620.85,-262.50,-159.622
+6620.85,-225.00,-135.274
+6620.85,-187.50,-110.739
+6620.85,-150.00,-85.994
+6620.85,-112.50,-60.976
+6620.85,-75.00,-35.465
+6620.85,-37.50,-7.052
+6620.85,-7.50,0.000
+6620.85,7.50,14.618
+6620.85,37.50,38.934
+6620.85,75.00,66.586
+6620.85,112.50,93.948
+6620.85,150.00,121.333
+6620.85,187.50,148.819
+6620.85,225.00,176.435
+6620.85,262.50,204.193
+6620.85,300.00,232.099
+6620.85,337.50,260.156
+6620.85,375.00,288.368
+6620.85,412.50,316.734
+6620.85,450.00,345.256
+6620.85,487.50,373.934
+6620.85,525.00,402.768
+6620.85,562.50,431.757
+6620.85,600.00,460.903
+6620.85,637.50,490.203
+6620.85,675.00,519.659
+6620.85,712.50,549.270
+6620.85,750.00,579.036
+7034.65,-750.00,-486.121
+7034.65,-712.50,-462.762
+7034.65,-675.00,-439.215
+7034.65,-637.50,-415.480
+7034.65,-600.00,-391.557
+7034.65,-562.50,-367.446
+7034.65,-525.00,-343.149
+7034.65,-487.50,-318.666
+7034.65,-450.00,-293.995
+7034.65,-412.50,-269.138
+7034.65,-375.00,-244.093
+7034.65,-337.50,-218.860
+7034.65,-300.00,-193.436
+7034.65,-262.50,-167.817
+7034.65,-225.00,-141.996
+7034.65,-187.50,-115.958
+7034.65,-150.00,-89.674
+7034.65,-112.50,-63.058
+7034.65,-75.00,-35.799
+7034.65,-37.50,-3.223
+7034.65,-7.50,0.000
+7034.65,7.50,16.292
+7034.65,37.50,42.535
+7034.65,75.00,72.058
+7034.65,112.50,101.207
+7034.65,150.00,130.364
+7034.65,187.50,159.625
+7034.65,225.00,189.027
+7034.65,262.50,218.585
+7034.65,300.00,248.308
+7034.65,337.50,278.199
+7034.65,375.00,308.261
+7034.65,412.50,338.497
+7034.65,450.00,368.905
+7034.65,487.50,399.488
+7034.65,525.00,430.245
+7034.65,562.50,461.176
+7034.65,600.00,492.281
+7034.65,637.50,523.560
+7034.65,675.00,555.012
+7034.65,712.50,586.638
+7034.65,750.00,618.436
+7448.45,-750.00,-510.929
+7448.45,-712.50,-486.404
+7448.45,-675.00,-461.667
+7448.45,-637.50,-436.720
+7448.45,-600.00,-411.563
+7448.45,-562.50,-386.196
+7448.45,-525.00,-360.620
+7448.45,-487.50,-334.835
+7448.45,-450.00,-308.841
+7448.45,-412.50,-282.637
+7448.45,-375.00,-256.223
+7448.45,-337.50,-229.597
+7448.45,-300.00,-202.756
+7448.45,-262.50,-175.695
+7448.45,-225.00,-148.405
+7448.45,-187.50,-120.865
+7448.45,-150.00,-93.035
+7448.45,-112.50,-64.803
+7448.45,-75.00,-35.728
+7448.45,-37.50,0.000
+7448.45,-7.50,0.000
+7448.45,7.50,18.073
+7448.45,37.50,46.316
+7448.45,75.00,77.742
+7448.45,112.50,108.693
+7448.45,150.00,139.633
+7448.45,187.50,170.679
+7448.45,225.00,201.877
+7448.45,262.50,233.245
+7448.45,300.00,264.794
+7448.45,337.50,296.529
+7448.45,375.00,328.454
+7448.45,412.50,360.570
+7448.45,450.00,392.878
+7448.45,487.50,425.380
+7448.45,525.00,458.076
+7448.45,562.50,490.964
+7448.45,600.00,524.046
+7448.45,637.50,557.321
+7448.45,675.00,590.788
+7448.45,712.50,624.448
+7448.45,750.00,658.300
+7862.25,-750.00,-535.185
+7862.25,-712.50,-509.519
+7862.25,-675.00,-483.618
+7862.25,-637.50,-457.482
+7862.25,-600.00,-431.113
+7862.25,-562.50,-404.509
+7862.25,-525.00,-377.673
+7862.25,-487.50,-350.603
+7862.25,-450.00,-323.301
+7862.25,-412.50,-295.764
+7862.25,-375.00,-267.993
+7862.25,-337.50,-239.985
+7862.25,-300.00,-211.735
+7862.25,-262.50,-183.238
+7862.25,-225.00,-154.481
+7862.25,-187.50,-125.438
+7862.25,-150.00,-96.054
+7862.25,-112.50,-66.179
+7862.25,-75.00,-35.191
+7862.25,-37.50,0.000
+7862.25,-7.50,0.000
+7862.25,7.50,19.962
+7862.25,37.50,50.282
+7862.25,75.00,83.643
+7862.25,112.50,116.414
+7862.25,150.00,149.150
+7862.25,187.50,181.992
+7862.25,225.00,214.994
+7862.25,262.50,248.182
+7862.25,300.00,281.567
+7862.25,337.50,315.157
+7862.25,375.00,348.956
+7862.25,412.50,382.965
+7862.25,450.00,417.187
+7862.25,487.50,451.622
+7862.25,525.00,486.270
+7862.25,562.50,521.133
+7862.25,600.00,556.208
+7862.25,637.50,591.497
+7862.25,675.00,626.999
+7862.25,712.50,662.713
+7862.25,750.00,698.640
+8276.06,-750.00,-558.870
+8276.06,-712.50,-532.090
+8276.06,-675.00,-505.048
+8276.06,-637.50,-477.747
+8276.06,-600.00,-450.186
+8276.06,-562.50,-422.366
+8276.06,-525.00,-394.288
+8276.06,-487.50,-365.951
+8276.06,-450.00,-337.355
+8276.06,-412.50,-308.500
+8276.06,-375.00,-279.383
+8276.06,-337.50,-250.003
+8276.06,-300.00,-220.353
+8276.06,-262.50,-190.425
+8276.06,-225.00,-160.202
+8276.06,-187.50,-129.653
+8276.06,-150.00,-98.703
+8276.06,-112.50,-67.150
+8276.06,-75.00,-34.118
+8276.06,-37.50,0.000
+8276.06,-7.50,0.000
+8276.06,7.50,21.961
+8276.06,37.50,54.438
+8276.06,75.00,89.769
+8276.06,112.50,124.380
+8276.06,150.00,158.924
+8276.06,187.50,193.572
+8276.06,225.00,228.390
+8276.06,262.50,263.407
+8276.06,300.00,298.639
+8276.06,337.50,334.095
+8276.06,375.00,369.779
+8276.06,412.50,405.694
+8276.06,450.00,441.842
+8276.06,487.50,478.224
+8276.06,525.00,514.841
+8276.06,562.50,551.692
+8276.06,600.00,588.778
+8276.06,637.50,626.099
+8276.06,675.00,663.654
+8276.06,712.50,701.442
+8276.06,750.00,739.464
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..66126d1e6a07666c8737ecad12590dffa7e49d11
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_drag.vemd
@@ -0,0 +1,24 @@
+n [rpm] , T_drag [Nm]
+0, -1.77
+41.3802852038928, -1.86
+413.802852038928, -2.72
+827.605704077856, -3.66
+1241.40855611678, -4.61
+1655.21140815571, -5.55
+2069.01426019464, -6.5
+2482.81711223357, -7.45
+2896.6199642725, -8.39
+3310.42281631142, -9.34
+3724.22566835035, -10.29
+4138.02852038928, -11.23
+4551.83137242821, -12.18
+4965.63422446714, -13.12
+5379.43707650606, -14.07
+5793.23992854499, -15.02
+6207.04278058392, -15.96
+6620.84563262285, -16.91
+7034.64848466177, -17.86
+7448.4513367007, -18.8
+7862.25418873963, -19.75
+8276.05704077856, -20.69
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_fld.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..45c4af93a701b08dff7dd3c24b76d310c4179363
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/EM_fld.vemp
@@ -0,0 +1,25 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 750.00, -750.00
+41, 750.00, -750.00
+414, 750.00, -750.00
+828, 750.00, -750.00
+1241, 750.00, -750.00
+1655, 750.00, -750.00
+2069, 750.00, -750.00
+2483, 625.00, -625.00
+2897, 535.71, -535.71
+3310, 468.75, -468.75
+3724, 416.67, -416.67
+4138, 375.00, -375.00
+4552, 340.91, -340.91
+4966, 312.50, -312.50
+5379, 288.46, -288.46
+5793, 267.86, -267.86
+6207, 250.00, -250.00
+6621, 234.38, -234.38
+7035, 220.59, -220.59
+7448, 208.33, -208.33
+7862, 197.37, -197.37
+8276, 187.50, -187.50
+
+
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gear_indirect.vtlm b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gear_indirect.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..aa8fc919ef73927ecce1e18f2b0d790cd9e5a97b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gear_indirect.vtlm
@@ -0,0 +1,11 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-50000,1500
+0,-125,3.75
+0,0,0
+0,125,3.75
+0,50000,1500
+20000,-50000,1500
+20000,-780,23.25
+20000,0,0
+20000,780,23.25
+20000,50000,1500
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_Map.vemo b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_Map.vemo
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_Map.vemo
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_Map.vemo
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_drag.vemd b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_drag.vemd
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_drag.vemd
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_drag.vemd
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_fld.vemp b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_fld.vemp
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/Gen_fld.vemp
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Gen_fld.vemp
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbat b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbat
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericBattery_PEV_800V.vbat
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbat
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatr b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..0196fe606aaeb90d728d71105fe6f424aa2d94c2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..5203594de4f9edfb75fb9b47aa2b8ed2f471ea5f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericBattery_PEV_800V.vbatv
@@ -0,0 +1,12 @@
+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/Hybrids/GenericVehicle_S2_APTN_PCC/GenericGen.vem b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericGen.vem
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/GenericGen.vem
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/GenericGen.vem
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5LH_rl_APTN.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5LH_rl_APTN.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5LH_rl_APTN.vecto
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5LH_rl_APTN.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN_PCC/HEV_S2_Group5_LH_rl.vveh
rename to VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/HEV_S2_Group5_LH_rl.vveh
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Hybrid_Parameters.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Hybrid_Parameters.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..2f2ed814fcff9e24e146e56f0d0ff41378f5a386
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/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/Hybrids/GenericVehicle_S2_APTN/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..877189e0ea769225acc1823bc8344ca346c0e5cb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1500, 1500
+100, 1500, 1500
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/NoCompressor.ACMP b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/NoCompressor.ACMP
new file mode 100644
index 0000000000000000000000000000000000000000..f13be9533f777a28512e385e1c43cc41ca421a97
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/NoCompressor.ACMP
@@ -0,0 +1,4 @@
+rpm,flowRate [l/min],power on [W],power off [W]
+0,0,0,0
+500,0,0,0
+3000,0,0,0
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/REESS_SOC_curve.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..745afc9500ba00a1a4a49acb4752c88dd2105a4c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/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/Hybrids/GenericVehicle_S2_APTN/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/ShiftParameters.vtcu
new file mode 100644
index 0000000000000000000000000000000000000000..a26e0e50f9e03240a8ddf18d296b8edbcda8bdcb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/ShiftParameters.vtcu
@@ -0,0 +1,14 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:52:04.0766564Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "Rating_current_gear": 0.995,
+ "RatioEarlyUpshiftFC" : 24,
+ "RatioEarlyDownshiftFC" : 24
+
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..b03ec7e47e9765ae57e43462c7f4c3ad15a38e7e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s�],dec [m/s�]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/xEV_Aux.vaux b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/xEV_Aux.vaux
new file mode 100644
index 0000000000000000000000000000000000000000..8da7fd167089916a4dce032389d35c90e03f8776
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_APTN/xEV_Aux.vaux
@@ -0,0 +1,34 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-10-22T12:25:57.2960587Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "PneumaticSystem": {
+ "CompressorMap": "NoCompressor.ACMP",
+ "AverageAirDemand": 0.0,
+ "SmartAirCompression": false,
+ "GearRatio": 0.0
+ },
+ "ElectricSystem": {
+ "AlternatorEfficiency": 0.0,
+ "CurrentDemand": 0.0,
+ "CurrentDemandEngineOffDriving": 104.219081272085,
+ "CurrentDemandEngineOffStandstill": 103.795053003534,
+ "AlternatorType": "Conventional",
+ "ElectricStorageCapacity": 0.0,
+ "BatteryEfficiency": 1.0,
+ "MaxAlternatorPower": 0.0,
+ "DCDCConverterEfficiency": 0.98,
+ "ESSupplyFromHEVREESS": true
+ },
+ "HVAC": {
+ "ElectricPowerDemand": 0.0,
+ "MechanicalPowerDemand": 0.0,
+ "AuxHeaterPower": 0.0,
+ "AverageHeatingDemand": 0.0
+ }
+ }
+}
\ No newline at end of file