diff --git a/VectoCore/VectoCore/Models/Simulation/ISimulatorFactoryFactory.cs b/VectoCore/VectoCore/Models/Simulation/ISimulatorFactoryFactory.cs
index 0d26b91c1c8575547753e1c7b8fd89ee9b4f4e37..c36bc05e9a1fe5d3e7e3e69a2084ba34883dfc05 100644
--- a/VectoCore/VectoCore/Models/Simulation/ISimulatorFactoryFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/ISimulatorFactoryFactory.cs
@@ -37,11 +37,6 @@ namespace TUGraz.VectoCore.Models.Simulation
 {
 	public interface ISimulatorFactoryFactory
 	{
-		ISimulatorFactory Factory(
-			ExecutionMode mode, 
-			IInputDataProvider dataProvider,
-			IOutputDataWriter writer, bool validate = true);
-
 		ISimulatorFactory Factory(ExecutionMode mode, 
 			IInputDataProvider dataProvider,
 			IOutputDataWriter writer,
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
index cc3da5ccb458d7255027824efb1143bcb504b2db..b4c8f8e5dfd6d6e526506d6482af250c857ce58c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ComponentData/IEPC_StdValues.xml
@@ -45,7 +45,7 @@
 					<Entry outShaftSpeed="4000.00" torque="4000.00" electricPower="20000.00"/>
 				</PowerMap>
 			</VoltageLevel>
-			<DragCurve gear="1">
+			<DragCurve>
 				<Entry outShaftSpeed="0.00" dragTorque="10.00"/>
 				<Entry outShaftSpeed="4000.00" dragTorque="30.00"/>
 			</DragCurve>
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
index 66ebf86333ccd85b9236f59d3a766fdb6d080e55..5c56e607819b53f5fc451fadf0cb802b6baa0894 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
@@ -294,7 +294,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			var jobContainer = new JobContainer(sumData);
 			var dataProvider = xmlInputReader.CreateEngineering(EngineeringSampleFile);
 
-			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter);
+			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter, null, null);
 			runsFactory.WriteModalResults = true;
 
 			Assert.That(() => jobContainer.AddRuns(runsFactory),
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
index 5943588c1f1922db0a42874bdf3e052f8ed02c04..c3cc4ae1f091d3d7ce1152abf7d315e505132ac5 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
@@ -486,7 +486,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			var jobContainer = new JobContainer(sumData);
 			var dataProvider = XMLInputReader.CreateEngineering(EngineeringSampleFile);
 
-			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter);
+			var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter, null, null);
 			runsFactory.WriteModalResults = true;
 
 			Assert.That(() => jobContainer.AddRuns(runsFactory),
@@ -757,7 +757,7 @@ namespace TUGraz.VectoCore.Tests.XML
 
 			var inputDataProvider = XMLInputReader.CreateEngineering(stream);
 
-			var factory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, inputDataProvider, new FileOutputWriter("dummy"));
+			var factory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, inputDataProvider, new FileOutputWriter("dummy"), null, null);
 
 			var jobContainer = new JobContainer(null);
 			Assert.That(() => jobContainer.AddRuns(factory),