diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index 2f0115a5829d5aa77a5a9f096b6fb3f18c6f9ba7..fe6263ef53ff5cb140ca49eda5e15aa800692de9 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -8,10 +8,7 @@ using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.Reader.ComponentData;
 using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
 using TUGraz.VectoCore.Models.Simulation.Impl;
-using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 using TUGraz.VectoCore.OutputData;
-using TUGraz.VectoCore.OutputData.FileIO;
-using TUGraz.VectoCore.Tests.Integration.Declaration;
 
 namespace TUGraz.VectoCore.Tests.FileIO
 {
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
index d99727cc21b79660571b203083f7d334723bfc4a..98da649f063210d986c7d4ac930c3cfa99f151af 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonWriteTest.cs
@@ -34,8 +34,6 @@ using NUnit.Framework;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VECTO;
-
 
 namespace TUGraz.VectoCore.Tests.FileIO
 {
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 50aef6d077b850383827338d05354d28b194f30d..038e66ad62333d16df3a0bbf9cb743142f409810 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -38,7 +38,8 @@ using Formatting = Newtonsoft.Json.Formatting;
 namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 {
 
-	[TestFixture()]
+	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class CompletedBusFactorMethodTest
 	{
 		const string JobFile_Group41 = @"TestData\Integration\Buses\FactorMethod\CompletedBus_41-32b.vecto";
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
index 991a0731a24c60d11b48e945a7fdb55b2ca0353c..040c05e9281ca84999b1f2087f66c9cbca2f4002 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusSanityCheckTests.cs
@@ -22,6 +22,7 @@ using TUGraz.VectoCore.Tests.Utils;
 namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class CompletedBusSanityCheckTests
 	{
 		private IXMLInputDataReader _xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs b/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
index d4284c458611e6e8d5d21c6e5d2a245246a8a783..4f6e9f1dbabb600c0951adbad4aafda53c115a1f 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/TestMaxMassInMUCycle.cs
@@ -42,7 +42,7 @@ using TUGraz.VectoCore.Tests.Models.Simulation;
 
 namespace TUGraz.VectoCore.Tests.Integration.Declaration
 {
-	[TestFixture()]
+	[TestFixture]
 	[Parallelizable(ParallelScope.All)]
 	public class TestMaxMassInMUCycle
 	{
diff --git a/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs b/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
index 3a91ec5a632d784d54844040b538588c83187066..5e626b018d8d70d1efe3a15d012aa339d21274f1 100644
--- a/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/DualFuel/DualFuelTests.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
 namespace TUGraz.VectoCore.Tests.Integration.DualFuel
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DualFuelTests
 	{
 		private StandardKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
index 1533f063a48d640cbc472cf00ddf0f9f86f940c0..d5856a995ea6e8455f6f70dbfa4c640e4544ed87 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/BusFactoryTest.cs
@@ -13,6 +13,7 @@ using TUGraz.VectoCore.Tests.Models.Simulation;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class BusFactoryTest
 	{
 		protected IXMLInputDataReader xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
index cab51b8904409611d3ead83d5da6958a45a0e8e4..b9f6a2a2a66902aa15dafb8b784dd363ee9ae1e0 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
@@ -1,16 +1,11 @@
 using System.IO;
-using System.Linq;
 using System.Xml;
 using System.Xml.XPath;
 using Ninject;
 using NUnit.Framework;
-using NUnit.Framework.Internal;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Resources;
-using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Configuration;
 using TUGraz.VectoCore.InputData.FileIO.XML;
-using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.OutputData;
 using TUGraz.VectoCore.OutputData.FileIO;
@@ -19,7 +14,7 @@ using TUGraz.VectoCore.Utils;
 
 namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
 {
-	[TestFixture()]
+	[TestFixture]
 	[Parallelizable(ParallelScope.All)]
 	public class DeclarationAdapterCreateVocationalVehicleTest
 	{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
index a298c53a9d73a494a8c3be3b5122e80b69551755..a22afffcb0369e3e237df24601ab2ed3a7daeede 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
@@ -31,7 +31,6 @@
 
 using NUnit.Framework;
 using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.Models.Declaration;
 using System.IO;
 
 namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
index 68180288b80adccc153b77c4a300902ee5bead7a..70eab05f3f1c7027cf1dad0d04ff8a401a377746 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
@@ -32,7 +32,6 @@
 using System.IO;
 using NUnit.Framework;
 using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.Models.Declaration;
 
 namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
 {
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
index b256f40250f7f25a23498dc7655b0a31a3e00e35..efd4dcf8723e5f91ce08c3838bdf83890f29a049 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
@@ -31,7 +31,6 @@
 
 using NUnit.Framework;
 using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.Models.Declaration;
 
 namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
 {
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index ac0839d7ce8b18e245c24a27e2a810c2ea110248..750ffcb22ba94b261bc4e9fc0672088c71ee12cb 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using TUGraz.VectoCommon.BusAuxiliaries;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Declaration;
@@ -8,6 +7,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DeclarationSegmentComplete2AxleBusesTest
 	{
 		private MissionType[] _missionsTypes;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index 0af2d107ca230d5a915c21983966758616be3b5c..5b66ac7f8163eb719781e64c773073282d1e3577 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using NUnit.Framework;
-using TUGraz.VectoCommon.BusAuxiliaries;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Declaration;
@@ -12,6 +7,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DeclarationSegmentComplete3AxleBusesTest
 	{
 		private MissionType[] _missionsTypes;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index 57f5cf213896e456e4f74f5b1ae0080cf69b7a1f..2f61a2b4b2e470aa4707d980a2445bc6964f457b 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NUnit.Framework;
-using TUGraz.VectoCommon.BusAuxiliaries;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Declaration;
@@ -8,6 +7,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DeclarationSegmentComplete4AxleBusesTest
 	{
 		private MissionType[] _missionsTypes;
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 2251a040c9008f47f6c4d7f87710b93b79e3d4d2..c3c33b3ec2e8f52f664eaf1b905818559b3185a9 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using TUGraz.VectoCommon.BusAuxiliaries;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.Declaration;
@@ -9,6 +8,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DeclarationSegmentHeavyBusesTest
 	{
 		[
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
index 549f553a3749ddec060b62a0485ee4bd3d3c5da4..44b0a43b6ac6726bf8df11e32b6e54ff7962b3fa 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
@@ -670,6 +670,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 	}
 
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ShiftPolygonComparison
 	{
 		const string BasePath = @"E:\QUAM\Workspace\Daten_INTERN\Testfahrzeuge\";
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusPowertrainModelData.cs b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusPowertrainModelData.cs
index 2d85eb11c919f7f7d6571da43341ad52823d197a..215621504340f9d687d8dffbff9bdedefe0900a5 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusPowertrainModelData.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/TestGenericBusPowertrainModelData.cs
@@ -7,6 +7,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.Models.Declaration
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class TestGenericBusPowertrainModelData
 	{
 
diff --git a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
index 1d3ff4dffd7fa6b55bbc0532b0aa539605b131e3..1a8b7f25ffb7f7d049616a5ffb332e0371a99fd1 100644
--- a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
+++ b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs
@@ -43,6 +43,7 @@ using Wheels = TUGraz.VectoCore.Models.SimulationComponent.Impl.Wheels;
 namespace TUGraz.VectoCore.Tests.Models.EngineeringMode
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class EngineeringModeBusAuxTest
 	{
 		protected IXMLInputDataReader xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
index 949e4396bd99d65745f235ec0e3bd69ae55b8b6e..bfb4afd14bd0a7406d72e761836a26884cb47da2 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
@@ -45,6 +45,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.Tests.Models.Simulation
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class DrivingCycleTests
 	{
 		[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
index 6cce70c95eff8275ab29dffea6752f7866d6989a..e11683c6abb135654b985d6277859878f682c6e7 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
@@ -14,6 +14,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
 namespace TUGraz.VectoCore.Tests.Models.Simulation
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ShiftStrategyV2Test
 	{
 		public const string Class9Decl =
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
index f154d32a4a84e693d3e4313fcc84e6886e0fc211..1079907c3d8bd8a6fbfc9d340d18d56d9272cd44 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationPreprocessingTest.cs
@@ -17,6 +17,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
 namespace TUGraz.VectoCore.Tests.Models.Simulation
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class SimulationPreprocessingTest
 	{
 		private StandardKernel _kernel;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
index f76e893e27b2605a47f2889cc1853896a52d28e3..85cd34b222187ff93ef7467c77c533a509673bc0 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatterySystemTest.cs
@@ -17,6 +17,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class BatterySystemTest
 	{
 		public const string componentFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
index 5d5196dfca0681b10d06d0a600bc94aa001d3a28..05e1d7820ff83adc756b4c7fc2fdbfed880cc4cd 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs
@@ -20,6 +20,7 @@ using Battery = TUGraz.VectoCore.Models.SimulationComponent.Impl.Battery;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class BatteryTest
 	{
 		public const string componentFile = @"TestData\Hybrids\Battery\GenericBattery.vbat";
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index 1af5d540f2b0fae28eae9f33ba5cc9a605441f5f..f8861e6e389997e169f7775fc18ba2138558aa16 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -23,6 +23,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ElectricMotorTest
 	{
 		public const string MotorFile = @"TestData\Hybrids\ElectricMotor\GenericEMotor.vem";
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/SuperCapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/SuperCapTest.cs
index 56c45acca7b0794f3a8fb84bf7e4899fa85496f6..978787d05e6a09fe74b8cdefbdc4b7022b4ddc29 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/SuperCapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/SuperCapTest.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCore.Tests.Utils;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class SuperCapTest
 	{
 		[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index a861e21b081e5862e935bc768d6354e89d5812f1..02fb6a03f74f114462d8370efd1ade46096dc254 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -7,6 +7,7 @@ using TUGraz.VectoCore.InputData.Reader.ComponentData;
 
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ElectricMotorEfficienyMapTest
 	{
 
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorMaxTorqueLimitationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorMaxTorqueLimitationTest.cs
index 5427c0fb8e37d3534f211d670f792951cfe4516c..7e5536bbde127b93c06adee8e16a5d15ea4edf0b 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorMaxTorqueLimitationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorMaxTorqueLimitationTest.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCore.Tests.Utils;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ElectricMotorMaxTorqueLimitationTest
 	{
 		[OneTimeSetUp]
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ShiftstrategyParameterTests.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ShiftstrategyParameterTests.cs
index 3e80a9d2249368d89c139e40b05b27f8435d6d08..a724df5ad2202b742400bd94e0c45f65f1d9b113 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ShiftstrategyParameterTests.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ShiftstrategyParameterTests.cs
@@ -7,6 +7,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class ShiftstrategyParameterTests
 	{
 
diff --git a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
index 9a974d81f2ff606b7f1453b7ff6d521788371665..7ae71a1a3a18e9b37df634c6f65f10ed3c40428e 100644
--- a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
@@ -17,6 +17,7 @@ using TUGraz.VectoCore.Utils;
 namespace TUGraz.VectoCore.Tests.Models
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class WHRMapTest
 	{
 		public const string SingleFuelWHRVehicle = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleSingleModeSingleFuel_WHR.xml";
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
index ecf3fab04ffc80426fd8861429bc9c5855cbc359..c0331eab1a7aba44d01841baf940925d46c274eb 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
@@ -27,7 +27,7 @@ using TUGraz.VectoCore.Tests.Utils;
 namespace TUGraz.VectoCore.Tests.Reports
 {
 	[TestFixture]
-	//[Parallelizable]
+	[Parallelizable(ParallelScope.All)]
 	public class ModDataPostprocessingTest
 	{
 		private double busAuxAlternatorEff = 0.753;
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index 4bceadbd97b62b68f2db214d2ee3608095fe5f06..e82eceb2691ff41e03f93e84c6a78766d78ed0a4 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -15,6 +15,7 @@ namespace TUGraz.VectoCore.Tests.XML
 {
 
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class XMLCompleteBusReaderTest
 	{
 		private const string CompleteBusExample =
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 39be4f80efb63c90822f6f0bf9ae3d492e37b3df..13c06eb66367ab2b9ba5b8a9fec885b45e8e5602 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -35,13 +35,11 @@ using System.Xml;
 using Ninject;
 using NUnit.Framework;
 using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.FileIO.XML;
 using TUGraz.VectoCore.Models.Simulation;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.OutputData;
 using TUGraz.VectoCore.OutputData.FileIO;
-using TUGraz.VectoCore.Tests.Models.Simulation;
 
 namespace TUGraz.VectoCore.Tests.XML
 {
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
index 5f2318204e583dbec61b81e89feb43a6d3231324..be59f9b996d8e63c5a18d3481303ea8ab22a00fa 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
@@ -40,7 +40,6 @@ using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.OutputData;
 using TUGraz.VectoCore.OutputData.FileIO;
 using TUGraz.VectoCore.Tests.Utils;
-using TUGraz.VectoCore.Utils;
 using NUnit.Framework;
 using TUGraz.VectoCore.InputData.FileIO.XML;
 using TUGraz.VectoCore.Models.Simulation;
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index 50fba39851d0b4653563b5ea849c5b4cc42ab59a..0cdd7a33f1155fa7a83314171b360477ce843c7b 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCore.InputData.FileIO.XML;
 namespace TUGraz.VectoCore.Tests.XML
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class XMLMultistageBusConsolidatedInputDataTest
 	{
 		protected IXMLInputDataReader _xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 3f32009dea4d138c7d586b2e699900819b738c70..6eb57e694e83f1c7c5d3ce9cb74f63a9309e49a0 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -15,6 +15,7 @@ using TUGraz.VectoCore.Models.Declaration;
 namespace TUGraz.VectoCore.Tests.XML
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class XMLMultistageBusDataTest
 	{
 		protected IXMLInputDataReader _xmlInputReader;
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 04127d5f4f065075535a015d32563b68c11ae934..f8ffca2207b8fda49f5ea9a2cf48564252dfa78d 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCore.InputData.FileIO.XML;
 namespace TUGraz.VectoCore.Tests.XML
 {
 	[TestFixture]
+	[Parallelizable(ParallelScope.All)]
 	public class XMLMultistageBusInputDataTest
 	{
 		protected IXMLInputDataReader xmlInputReader;