diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
index d2fdd899b86e3fbfba0c0c5958caa687d00166ef..364b10a2f4381752949450e572d9a108787e7a40 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vecto
@@ -3,7 +3,7 @@
     "CreatedBy": "",
     "Date": "2019-12-03T16:40:42.9254153Z",
     "AppVersion": "3",
-    "FileVersion": 5
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -13,6 +13,7 @@
     "GearboxFile": "GearboxPowerSplit.vgbx",
     "TCU": "GearboxPowerSplit.vgbx",
     "ShiftStrategy": "",
+    "HybridStrategyParams": "HybridStrategyParams.vhctl",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
@@ -47,7 +48,7 @@
       "OverSpeed": 5.0
     },
     "Cycles": [
-     "LongHaul",
+      "LongHaul",
       "Coach",
       "Construction",
       "HeavyUrban",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
index 8d3b62ada01ca12f70377ca56741bb8e3592a88f..01711a12dc09e380b08baafa5bbcd641721be862 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_PS.vveh
@@ -31,7 +31,7 @@
       "LossMap": "",
       "Cycle": ""
     },
-	"ElectricMotors": [
+    "ElectricMotors": [
       {
         "Count": 1,
         "Ratio": 1,
@@ -40,11 +40,13 @@
         "MotorFile": "GenericEMotor20kW.vem"
       }
     ],
-	"Battery": {
+    "Battery": {
       "NumPacks": 2,
       "BatteryFile": "GenericBattery.vbat"
     },
-	"InitialSoC": 80,
+    "InitialSoC": 80,
+    "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 1800000.0,
     "TorqueLimits": {},
     "IdlingSpeed": 0.0,
     "AxleConfig": {
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
index 4b741fc12df9ccc5f6707b85f92628c469c19bc7..8f84a2e16058fb29f218cf678f8d758288df23aa 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vecto
@@ -3,7 +3,7 @@
     "CreatedBy": "",
     "Date": "2019-12-03T16:40:13.1142195Z",
     "AppVersion": "3",
-    "FileVersion": 5
+    "FileVersion": 8
   },
   "Body": {
     "SavedInDeclMode": false,
@@ -13,6 +13,7 @@
     "GearboxFile": "GearboxSerial.vgbx",
     "TCU": "GearboxSerial.vgbx",
     "ShiftStrategy": "",
+    "HybridStrategyParams": "HybridStrategyParams.vhctl",
     "AuxiliaryAssembly": "Classic",
     "AuxiliaryVersion": "CLASSIC",
     "AdvancedAuxiliaryFilePath": "",
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
index f7e35d17e8a34c06c2f9b5bba3ccf29e58490477..37e8118274680cb2d2ab25124b2ad1ec9575b439 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/CityBus_AT_Ser.vveh
@@ -31,7 +31,7 @@
       "LossMap": "",
       "Cycle": ""
     },
-	"ElectricMotors": [
+    "ElectricMotors": [
       {
         "Count": 1,
         "Ratio": 1,
@@ -44,7 +44,7 @@
       "NumPacks": 2,
       "BatteryFile": "GenericBattery.vbat"
     },
-	"InitialSoC": 80,
+    "InitialSoC": 80,
     "TorqueLimits": {},
     "IdlingSpeed": 0.0,
     "AxleConfig": {
@@ -75,6 +75,8 @@
     "PredictiveCruiseControl": "None",
     "ATEcoRollReleaseLockupClutch": false,
     "CdA": 4.83,
-    "VehicleHeight": 0.0
+    "VehicleHeight": 0.0,
+    "PowertrainConfiguration": "ParallelHybrid",
+    "MaxDrivetrainPower": 1800000.0
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/HybridStrategyParams.vhctl b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/HybridStrategyParams.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..e38a9d4f64e2f60dcec592f7cab47ebbcb228e7e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/HybridStrategyParams.vhctl
@@ -0,0 +1,17 @@
+{
+  "Header": {
+    "CreatedBy": "",
+    "Date": "2020-08-04T07:11:24.0318977Z",
+    "AppVersion": "3",
+    "FileVersion": 1
+  },
+  "Body": {
+    "EquivalenceFactor": 2.5,
+    "MinSoC": 20.0,
+    "MaxSoC": 80.0,
+    "TargetSoC": 50.0,
+    "MinICEOnTime": 3,
+    "AuxBufferTime": 5,
+    "AuxBufferChgTime":  3 
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..d802d5d760daf410bca1fa2b9aa42c231188f3ad
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_P1-APT/MaxCurrent.vimax
@@ -0,0 +1,4 @@
+SOC, I_charge, I_discharge
+0, 375, 375
+50, 375, 375
+100, 375, 375
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index f4cffabff24453ed173da24effc54f403826f8a6..b8e0b7f01cfa227141d34f3c0508664fc436234d 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -737,6 +737,12 @@
     <None Include="TestData\Hybrids\GenericVehicle_P1-APT\GenericEM_20kW.vemp">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestData\Hybrids\GenericVehicle_P1-APT\HybridStrategyParams.vhctl">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Hybrids\GenericVehicle_P1-APT\MaxCurrent.vimax">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Hybrids\GenericVehicle_P1-APT\TorqueConverter.vtcc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>