diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 4f508b83713ddac9c34beb4561a53e40e711bda2..4429f4c63da3a522cf746eb1e983a405bd6fb93e 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -1256,19 +1256,19 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 			switch (runData.GearboxData.Type) {
 				case GearboxType.AMT:
-					if (runData.JobType == VectoSimulationJobType.ConventionalVehicle) {
-						runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
-						return new AMTShiftStrategyOptimized(container);
-					}
-
-					if (runData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
-						runData.ShiftStrategy = PEVAMTShiftStrategy.Name;
-						return new PEVAMTShiftStrategy(container);
+					switch (runData.JobType) {
+						case VectoSimulationJobType.ConventionalVehicle:
+							runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
+							return new AMTShiftStrategyOptimized(container);
+						case VectoSimulationJobType.BatteryElectricVehicle:
+						case VectoSimulationJobType.SerialHybridVehicle:
+							runData.ShiftStrategy = PEVAMTShiftStrategy.Name;
+							return new PEVAMTShiftStrategy(container);
+						default:
+							throw new VectoException(
+								"no default gearshift strategy available for gearbox type {0} and job type {1}",
+								runData.GearboxData.Type, runData.JobType);
 					}
-
-					throw new VectoException(
-						"no default gearshift strategy available for gearbox type {0} and job type {1}",
-						runData.GearboxData.Type, runData.JobType);
 				//return new AMTShiftStrategy(runData, container);
 				case GearboxType.MT:
 					runData.ShiftStrategy = MTShiftStrategy.Name;
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 1620, 1620
+100, 1620, 1620
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/REESS_SOC_curve.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..745afc9500ba00a1a4a49acb4752c88dd2105a4c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/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_Job/SerialHybrid_S2.vveh b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
index 24ae296b1887a8ec91ac53be8a450ba0a87909da..b6760f07821975ba7f40c7669eacb9c1ed24cb82 100644
--- a/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Hybrids/GenericVehicle_S2_Job/SerialHybrid_S2.vveh
@@ -17,6 +17,11 @@
     "PowertrainConfiguration": "SerialHybrid",
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
+    "Retarder": {
+      "Type": "None",
+      "Ratio": 1.0,
+      "File": ""
+    },
 	  "ElectricMotors": [
         {
           "Count": 2,
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 7c67a0f0450b5f8f25a47ccd37bc12f3a85d758f..e7968f4d9b04ead3696d1dc1da1b49a78631b11e 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -800,6 +800,12 @@
     <None Include="TestData\Hybrids\GenericVehicle_S2_Job\Gen_Map.vemo">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestData\Hybrids\GenericVehicle_S2_Job\MaxCurrent.vimax">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Hybrids\GenericVehicle_S2_Job\REESS_SOC_curve.vbatv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Hybrids\GenericVehicle_S2_Job\SerialHybrid_S2.vveh">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>