diff --git a/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryFactoryTest.cs b/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryFactoryTest.cs
index 6d7e561d754a65643ea3f5ddee50ca3ab8065fb8..3ebfbaff8e6fcd247caf3c26f2f308f92e42437c 100644
--- a/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/InputData/RunDataFactory/RunDataFactoryFactoryTest.cs
@@ -20,6 +20,7 @@ using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.PrimaryBus;
 using TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.CompletedBusRunDataFactory;
 using TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDataFactory;
 using TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.PrimaryBusRunDataFactory;
+using TUGraz.VectoCore.Tests.Integration.Hybrid;
 
 namespace TUGraz.VectoCore.Tests.InputData.RunDataFactory
 {
@@ -671,6 +672,8 @@ namespace TUGraz.VectoCore.Tests.InputData.RunDataFactory
 				default:
 					throw new ArgumentOutOfRangeException(nameof(arch), arch, null);
 			}
+
+			arch = arch == ArchitectureID.P_IHPC ? ArchitectureID.P2 : arch; 
 			mock.Setup(p => p.JobInputData.Vehicle.ArchitectureID).
 				Returns(arch);
 			mock.Setup(p => p.JobInputData.JobType).