diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
index 7dd4168dd32f506feb8fc7cd88577b9443d2f979..adb36a678bc27b5d59f9a22b8effac29b7a2c727 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
index a6989b5373e0aba3a214cbf51ab8bca9de38c2aa..42fdbf0103047a292213e1afae9a1eeaef025236 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
index 02a0e402a8b1a63506939f19ae69bc8867fbd951..472aaad9c430241cbf28c43416269f415f07a87f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_325kW_noESS.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
index f35ef2a26a35c0c1089cf96c14dfa780458db812..37856609a0449cae5ff95580c3d0240a76d4f6b4 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_1.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
index 82ec3a0fb3cbf141437acada8701692f46a7e1a8..f015c11d54033a451af596d94a9c32a2566db4f8 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_EMLossMap_2.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
index c2c2624a0f5d1b31cc768dd833d8864e11980f87..4be223cd7fb3699f858a72f1c610d56afde04a5b 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitEMTorqueDrive.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
index 7ecbf6b54e0b3f4bca20d0b60851bf704ed6dc14..ce2bc81bc5e273d353e1720486c29accecc4208f 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_LimitVehiclePropTq.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
index 1eb59cbb90376661889e214298e3eb5d7c4ea71b..169dbca4154c2b3411820c6f84dd2e9cac6d1808 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_Group5_P2/P2 Group 5_noESS.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Vehicle\\Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vecto
index e04ba3b9d39cf361012c303bf759e368f19cd8e6..8e49fee9f12f292dcbe459532fe969900c2450fb 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Hyb_P2_Group5/Hyb_P2_Group5_80kWh.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 0.0,
"VACC": "Truck.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 10.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
index dacb726ae224260d16edb3f69c9bea845eb011ca..9674eb6b1236fe17f61bcffad2b6d7a4601a4248 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/Input CityBus 6x2_HEV_P2/CityBus_6x2_HEV_P2.vecto
@@ -22,7 +22,7 @@
"Padd_electric": 2800.0,
"VACC": "Acc_Citybus.vacc",
"EngineStopStartAtVehicleStopThreshold": 0.0,
- "EngineStopStartMaxOffTimespan": 0.0,
+ "EngineStopStartMaxOffTimespan": 1000.0,
"EngineStopStartUtilityFactor": 0.0,
"EcoRollMinSpeed": 0.0,
"EcoRollActivationDelay": 0.0,