diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
index 0cc437a0238b53d8f57c1dfc69a7f17f66d64cf7..5a4db3dbbb6edcf98fb40e13e5c722d00378f84e 100644
--- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
@@ -129,11 +129,11 @@ namespace TUGraz.VectoCore.Tests.Integration
//TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml"),
//TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml"),
TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_4x2_vehicle-class-5_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x2_vehicle-class-10_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml"),
- //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x4_vehicle-class-12_EURO6_2018.xml"),
- TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml")]
+ TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml"),
+ //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x2_vehicle-class-10_EURO6_2018.xml"),
+ //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml"),
+ //TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_6x4_vehicle-class-12_EURO6_2018.xml"),
+ TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml")]
public void TestXMLSummaryReportExists(string jobfile)
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
index e19150c83618395c69db102b100b2b5f86454850..ba8202f067e933c6f2cd89ed52a5467f0f112061 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx1Axl.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
index 6cc64ff5def0f1da6b0d8886c28e8766af675975..1dd51ccf02019fe181c5badaa0dbab77f59cf43f 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx1Whl1.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
index 588039a710bb50e1812a6280716bfd2d173aa006..81cc58e814c1a3820881479d3bf415b846a5139b 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx1Whl2.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
index cbac5f5b98ffd3ea3898e10e3c21a2bdefb0fd8b..06cacde4807c12faa7f4722ba2ee71390e7784c2 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx1.vveh",
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
index 18db3d71b4ebdaa1349292d4d437a40c9a80f158..21a2352cde5e232cf14f1544fb8d827041ab6367 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx3Axl.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
index 9690d09aa289af9262fcbb00b8ec99eadcce93bf..3175f83ee9e4ec595a6d40d08321563bec18d439 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx3Whl1.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
index e8e507aeeaae83a7255e425e2b9134ac82860c7f..ad0b870299038f1c349f7dfa238b6ebfdf9dddd8 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx3Whl2.vveh",
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
index 146dfc42c35740688df216b61ebf31ead92f1074..8328d24a4f7528cfb1b4ca0514b165fea3c01dbd 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx3.vveh",
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
index 33adc6edc976be6d12ddeee3b5bdbfab21a3078d..827203304d4e57baf3969bc144df68ebe9b383d7 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "IEPCVehicle_Gbx3_drag.vveh",
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
index e2f6ed93a6696a8fa7aae1ebba919c150f420657..8d82756d7f1b98a89e6182b180626404ea42bd48 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed.vecto
index ec266b20cc3dc2fc8c20f670fae33786d01c5ab8..66bba96eaddbeb065d0c95aa91995032fdeeeb32 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "3speedEV.vgbx",
"TCU": "3speedEV.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
index ec266b20cc3dc2fc8c20f670fae33786d01c5ab8..66bba96eaddbeb065d0c95aa91995032fdeeeb32 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "3speedEV.vgbx",
"TCU": "3speedEV.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
index ad0c66fd9de8f64feb647900fa7e0c9a56874fda..6743a508040d5974319c4db16072dc099d512458 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_BusAux.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"BusAux": "PEV-BusAux.vaux",
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
index 04b69288e4334d0eab87a44a8ebf08d585b80282..3b65310ebef94914d0a6170b2192e5b957940faa 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle_Cont30kW.vveh",
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto
index d69297d3ed4882ce1c708668d7b5206376557e2f..51dd2a06950949301086db652838b462be5b450e 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "Axle.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG_Cont30kW.vecto
index 705655eaba2db9136cd90e30270f850807a310b1..8ec9fd1af2ba384fd7b4ffa2480fd96e629c8435 100644
--- a/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG_Cont30kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/BatteryElectric/GenericVehicleB3/BEV_ENG_Cont30kW.vecto
@@ -10,7 +10,7 @@
"EngineOnlyMode": false,
"VehicleFile": "BatteryElectricVehicle_Cont30kW.vveh",
"GearboxFile": "Axle.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
index 5b5966ed15e472fb25689e1726ae6e73e6ff354a..6558eb7b69156fa298eda476a4875e1023b4345a 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithAxlegearInputRetarder.vecto
@@ -9,7 +9,7 @@
"SavedInDeclMode": false,
"VehicleFile": "E3WithAxlegearInputRetarder.vveh",
"GearboxFile": "Axle.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vecto b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vecto
index b22ec1812d358119f628b2faa56164b3f270fcb6..016c4a91ed91ad0744db4077634e25e85c042768 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Components/Retarder/E3/E3WithoutAxlegearInputRetarder.vecto
@@ -9,7 +9,7 @@
"SavedInDeclMode": false,
"VehicleFile": "E3WithoutAxlegearInputRetarder.vveh",
"GearboxFile": "Axle.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
index 3a4d93f4e55bb31268825f80295bf5fa14d13d01..8a512cdc25ac9820315eebe7f86c5e092cdd846c 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
index 23dc4d8779da2a340976283944f098d7eb74b70f..2ab4f8bf9b742f0a46926c1420d415675ee3666b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
index d826a010c7133b88f2373c6b8335da18a2eee0c8..5d89f019a50181b0141105044b797fde6a715aef 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
index d2d2ae973f430cb783c48cda76335d11ebaa8890..5925a85219ca99d7b501ff3f7bf79958daa47892 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
index f06545a5fa8c567c132fcd4291c0c5292bcce37c..062c8afc0b9a5bff0446643fa4bc12dafda2e3fd 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
index 4e6fcefa3c70689d8a89bcd47a51d7a232e28799..9538da5609863d3ffaa9bf85c2de1d8c1b9bc71b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
index f402ce770e3afc13e7c5ea64530f48e7a1d7fbad..2fd2b70b39928185dfc0386856f71fbc24538f4e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
index 72acd74aa5bf7b92fd7d255647930ba7d795b433..e2d61bb3cf1cc8ca5c0cb018ba79199940c984c0 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
index aad5769a42aa7bd720108aafe4ffa096c0f3c056..7ec225a223d54ed23c9cd0574f4530a400a3482e 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
@@ -13,7 +13,7 @@
"GearboxFile": "Axlegear.vgbx",
"TCU": "../Common/ShiftParameters.vtcu",
"HybridStrategyParams": "../Common/Hybrid_Parameters.vhctl",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "../Common/Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
index e2f6ed93a6696a8fa7aae1ebba919c150f420657..8d82756d7f1b98a89e6182b180626404ea42bd48 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/BEV_ENG.vecto
@@ -11,7 +11,7 @@
"VehicleFile": "BatteryElectricVehicle.vveh",
"GearboxFile": "Transmission\\AMT_12.vgbx",
"TCU": "Transmission\\AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto
index 54a59ab91ee0ecc110bda2d8cf6d5987ddfc7f87..4cf15812e921aa297cc1b79a04d2173f59d12748 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_NoADAS.vecto
@@ -10,7 +10,7 @@
"VehicleFile": "Class5_E2_NoADAS.vveh",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto
index 2acb421b46b679d886d0daa000a6e4b3b050b290..4a956d908cc324c9ae5c935f0bd0dd68d93803a7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC12.vecto
@@ -10,7 +10,7 @@
"VehicleFile": "Class5_E2_PCC12.vveh",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto
index e558eb2ca5c936b21db3ae2d9e6fbaa131927e30..bb51af7c5a5c2eeece5c7b7e15e2c73b1c7f5d17 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E2_PCC123.vecto
@@ -10,7 +10,7 @@
"VehicleFile": "Class5_E2_PCC123.vveh",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto
index 9bce71d427a4484045db6fef5fe8b1efc52abfce..bad6f441fb8357612fca69b0521b5204f679787f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E3_PCC123.vecto
@@ -9,7 +9,7 @@
"SavedInDeclMode": false,
"VehicleFile": "Class5_E3_PCC123.vveh",
"GearboxFile": "Axle.vgbx",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto
index 5435ec8f994f828a4330acc40402b16c5029be22..ce5a2813a4ad2bee44c1c833c0986990868adb3e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/Group5PCCEng/Class5_E4_PCC123.vecto
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehicleFile": "Class5_E4_PCC123.vveh",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto
index 441d634fe82a10701f6c315fb4805be12b302ad7..558661d334ad4adc3ff5d055d43d0e8678ffa0ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-PEV/VECTO-1483/E4_Group 5 LH_ll.vecto
@@ -8,7 +8,7 @@
"Body": {
"SavedInDeclMode": false,
"VehicleFile": "E4_Group5_LH_ll.vveh",
- "Padd_electric": 3540.0,
+ "Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 2.0,
"EngineStopStartMaxOffTimespan": 120.0,