diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index db29a7366de296980d640f87e882f74ac2107c24..2dcf3166d74ffb3e830432e2292f2303ee908a75 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -702,6 +702,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 
 			var bat = batteryInputData.ElectricStorageElements.Where(x => x.REESSPack.StorageType == REESSType.Battery).ToArray();
 
+			if (bat.Length == 0) {
+				return null;
+			}
+
 			var retVal = new BatterySystemData();
 			foreach (var entry in bat) {
                 var b = entry.REESSPack as IBatteryPackDeclarationInputData;
diff --git a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
index 47b439abc52fef93a2ea93ecd536836d3df19933..1d3ff4dffd7fa6b55bbc0532b0aa539605b131e3 100644
--- a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
@@ -221,7 +221,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// no HEV
 			Assert.Null(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.Null(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.Null(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.Null(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			Assert.AreEqual(AlternatorType.Conventional, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
 			Assert.IsFalse(container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS);
@@ -289,7 +289,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// no HEV
 			Assert.Null(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.Null(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.Null(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.Null(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			Assert.AreEqual(AlternatorType.Smart, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
 			Assert.IsFalse(container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS);
@@ -356,7 +356,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// HEV
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.NotNull(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.NotNull(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			Assert.AreEqual(AlternatorType.None, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
 			Assert.IsTrue(container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS);
@@ -425,7 +425,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// HEV
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.NotNull(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.NotNull(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			// simulated with alternator type NONE!
 			Assert.AreEqual(AlternatorType.None, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
@@ -474,7 +474,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// HEV, no DCDC converter
 			Assert.Null(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.NotNull(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.NotNull(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			// simulated with alternator type NONE!
 			Assert.AreEqual(AlternatorType.Conventional, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
@@ -612,7 +612,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// HEV, no DCDC converter
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.NotNull(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.NotNull(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			// simulated with alternator type NONE!
 			Assert.AreEqual(AlternatorType.Smart, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
@@ -704,7 +704,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 			// HEV
 			Assert.Null(container.Components.FirstOrDefault(x => x is DCDCConverter));
 			Assert.NotNull(container.Components.FirstOrDefault(x => x is ElectricSystem));
-			Assert.NotNull(container.Components.FirstOrDefault(x => x is Battery));
+			Assert.NotNull(container.Components.FirstOrDefault(x => x is BatterySystem));
 
 			// simulated with alternator type NONE!
 			Assert.AreEqual(AlternatorType.Smart, container.RunData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType);
@@ -903,8 +903,9 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 								BatteryInternalResistanceReader.Create("SoC, Ri\n0,0.02\n100,0.02".ToStream()),
 							MaxCurrent = BatteryMaxCurrentReader.Create(
 								"SOC, I_charge, I_discharge\n0, 375, 573\n100, 375, 375".ToStream()),
-						})
-					}
+						}),
+					},
+					InitialSoC = reessSoC.Value
 				};
 				var es = new ElectricSystem(container);
 				var battery = new BatterySystem(container, runData.BatteryData);