diff --git a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
index 51bf888e38e339edcd68f8352694ca35ecb739ac..b68718cc1fab9bb45f3a0eae597c333936dce4d6 100644
--- a/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
+++ b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs
@@ -66,8 +66,10 @@ namespace TUGraz.VectoCore.Models.Declaration
 			}
 		}
 
-		public override Watt Lookup(MissionType missionType, string technology = "Standard technology")
+		public override Watt Lookup(MissionType missionType, string technology = null)
 		{
+			if (string.IsNullOrWhiteSpace(technology))
+				technology = "Standard technology";
 			var value = base.Lookup(missionType, technology);
 			return value / _alternator.Lookup(missionType);
 		}
@@ -99,8 +101,10 @@ namespace TUGraz.VectoCore.Models.Declaration
 				}
 			}
 
-			public override double Lookup(MissionType missionType, string technology = "Standard alternator efficiency")
+			public override double Lookup(MissionType missionType, string technology = null)
 			{
+				if (string.IsNullOrWhiteSpace(technology))
+					technology = "Standard alternator efficiency";
 				return base.Lookup(missionType, technology);
 			}
 		}
diff --git a/VectoCore/VectoCore/Models/Declaration/Fan.cs b/VectoCore/VectoCore/Models/Declaration/Fan.cs
index cf9ce2fc2b7e6afdcd2f4aac7f6f847ed7867a61..b1940483d84025c8169bf112fc8fa45c5885035d 100644
--- a/VectoCore/VectoCore/Models/Declaration/Fan.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Fan.cs
@@ -63,7 +63,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 			}
 		}
 
-		public override Watt Lookup(MissionType mission, string technology)
+		public override Watt Lookup(MissionType mission, string technology = null)
 		{
 			if (string.IsNullOrWhiteSpace(technology))
 				technology = "Crankshaft mounted - Electronically controlled visco clutch";
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index b8999e0527e91dde7bcf149b7ec38d2c45ea66c8..10a20d3c75d0f82aeb72d7c4cb86a0b292f27e96 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -29,10 +29,6 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VectoCore.Models.Declaration;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Models.Simulation.Impl;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.Models;
@@ -40,10 +36,14 @@ using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.Reader;
 using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.Models.SimulationComponent.Data;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using TUGraz.VectoCore.OutputData;
 using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Utils;
 
 // ReSharper disable ObjectCreationAsStatement
 
@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			aux.AddConstant("STP",
 				SteeringPump.Lookup(MissionType.LongHaul, hdvClass,
 					new[] { "Variable displacement mech. controlled" }));
-			aux.AddConstant("ES", DeclarationData.ElectricSystem.Lookup(mission, null));
+			aux.AddConstant("ES", DeclarationData.ElectricSystem.Lookup(mission));
 			aux.AddConstant("AC",
 				DeclarationData.HeatingVentilationAirConditioning.Lookup(mission, hdvClass));