From f8ab9029ed5ea305a0082e5faafeff1ce13a1005 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Mon, 13 Feb 2023 11:21:54 +0100
Subject: [PATCH] updated json testfiles

---
 .../GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh    | 2 +-
 .../{IEPC_ENG_Gbx1Axl.vecto => IEPC__Gbx1Axl.vecto}             | 0
 .../GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh   | 2 +-
 .../{IEPC_ENG_Gbx1Whl1.vecto => IEPC__Gbx1Whl1.vecto}           | 0
 .../GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh   | 2 +-
 .../{IEPC_ENG_Gbx1Whl2.vecto => IEPC__Gbx1Whl2.vecto}           | 0
 .../JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh   | 2 +-
 .../IEPC_Gbx1Speed/{IEPC_ENG_Gbx1.vecto => IEPC__Gbx1.vecto}    | 0
 .../GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh    | 2 +-
 .../{IEPC_ENG_Gbx3Axl.vecto => IEPC__Gbx3Axl.vecto}             | 0
 .../GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh   | 2 +-
 .../{IEPC_ENG_Gbx3Whl1.vecto => IEPC__Gbx3Whl1.vecto}           | 0
 .../GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh   | 2 +-
 .../{IEPC_ENG_Gbx3Whl2.vecto => IEPC__Gbx3Whl2.vecto}           | 0
 .../JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh   | 2 +-
 .../PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh   | 2 +-
 .../IEPC_Gbx3Speed/{IEPC_ENG_Gbx3.vecto => IEPC__Gbx3.vecto}    | 0
 .../{IEPC_ENG_Gbx3_drag.vecto => IEPC__Gbx3_drag.vecto}         | 0
 .../JSON/PEV/GenericVehicleB2/{BEV_ENG.vecto => BEV_.vecto}     | 0
 .../{BEV_ENG_3speed.vecto => BEV__3speed.vecto}                 | 0
 .../{BEV_ENG_3speed_PTO.vecto => BEV__3speed_PTO.vecto}         | 0
 .../{BEV_ENG_BusAux.vecto => BEV__BusAux.vecto}                 | 0
 .../{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto}             | 0
 .../JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh       | 2 +-
 .../PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh   | 2 +-
 .../JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh   | 2 +-
 .../JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh     | 2 +-
 .../JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh       | 2 +-
 .../JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh  | 2 +-
 .../JSON/PEV/GenericVehicleB3/{BEV_ENG.vecto => BEV_.vecto}     | 0
 .../{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto}             | 0
 .../JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh       | 2 +-
 .../PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh   | 2 +-
 .../JSON/PEV/GenericVehicleB4/{BEV_ENG.vecto => BEV_.vecto}     | 0
 .../{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto}             | 0
 .../JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh       | 2 +-
 .../PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh   | 2 +-
 .../JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh       | 2 +-
 .../PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh   | 2 +-
 .../JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh   | 2 +-
 .../GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh    | 2 +-
 .../JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh       | 2 +-
 ...idTruck_ParHyb_ENG.vecto => Class2_RigidTruck_ParHyb_.vecto} | 0
 ...idTruck_ParHyb_ENG.vecto => Class2_RigidTruck_ParHyb_.vecto} | 0
 ...l_ENG.vecto => Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto} | 0
 .../{IEPC-S_ENG_Gbx1Axl.vecto => IEPC-S__Gbx1Axl.vecto}         | 0
 .../{IEPC-S_ENG_Gbx1Whl1.vecto => IEPC-S__Gbx1Whl1.vecto}       | 0
 .../{IEPC-S_ENG_Gbx1Whl2.vecto => IEPC-S__Gbx1Whl2.vecto}       | 0
 .../{IEPC-S_ENG_Gbx1.vecto => IEPC-S__Gbx1.vecto}               | 0
 .../{IEPC-S_ENG_Gbx3Axl.vecto => IEPC-S__Gbx3Axl.vecto}         | 0
 .../{IEPC-S_ENG_Gbx3Whl1.vecto => IEPC-S__Gbx3Whl1.vecto}       | 0
 .../{IEPC-S_ENG_Gbx3Whl2.vecto => IEPC-S__Gbx3Whl2.vecto}       | 0
 .../{IEPC-S_ENG_Gbx3.vecto => IEPC-S__Gbx3.vecto}               | 0
 .../{IEPC-S_ENG_Gbx3_drag.vecto => IEPC-S__Gbx3_drag.vecto}     | 0
 .../JSON/S_HEV/S2_Job/{BEV_ENG.vecto => BEV_.vecto}             | 0
 55 files changed, 24 insertions(+), 24 deletions(-)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/{IEPC_ENG_Gbx1Axl.vecto => IEPC__Gbx1Axl.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/{IEPC_ENG_Gbx1Whl1.vecto => IEPC__Gbx1Whl1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/{IEPC_ENG_Gbx1Whl2.vecto => IEPC__Gbx1Whl2.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/{IEPC_ENG_Gbx1.vecto => IEPC__Gbx1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/{IEPC_ENG_Gbx3Axl.vecto => IEPC__Gbx3Axl.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/{IEPC_ENG_Gbx3Whl1.vecto => IEPC__Gbx3Whl1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/{IEPC_ENG_Gbx3Whl2.vecto => IEPC__Gbx3Whl2.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/{IEPC_ENG_Gbx3.vecto => IEPC__Gbx3.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/{IEPC_ENG_Gbx3_drag.vecto => IEPC__Gbx3_drag.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/{BEV_ENG.vecto => BEV_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/{BEV_ENG_3speed.vecto => BEV__3speed.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/{BEV_ENG_3speed_PTO.vecto => BEV__3speed_PTO.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/{BEV_ENG_BusAux.vecto => BEV__BusAux.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/{BEV_ENG.vecto => BEV_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/{BEV_ENG.vecto => BEV_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/{BEV_ENG_Cont30kW.vecto => BEV__Cont30kW.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/{Class2_RigidTruck_ParHyb_ENG.vecto => Class2_RigidTruck_ParHyb_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/{Class2_RigidTruck_ParHyb_ENG.vecto => Class2_RigidTruck_ParHyb_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/{Class2_RigidTruck_ParHyb_SuperCap_Ovl_ENG.vecto => Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/{IEPC-S_ENG_Gbx1Axl.vecto => IEPC-S__Gbx1Axl.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/{IEPC-S_ENG_Gbx1Whl1.vecto => IEPC-S__Gbx1Whl1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/{IEPC-S_ENG_Gbx1Whl2.vecto => IEPC-S__Gbx1Whl2.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/{IEPC-S_ENG_Gbx1.vecto => IEPC-S__Gbx1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/{IEPC-S_ENG_Gbx3Axl.vecto => IEPC-S__Gbx3Axl.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/{IEPC-S_ENG_Gbx3Whl1.vecto => IEPC-S__Gbx3Whl1.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/{IEPC-S_ENG_Gbx3Whl2.vecto => IEPC-S__Gbx3Whl2.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/{IEPC-S_ENG_Gbx3.vecto => IEPC-S__Gbx3.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/{IEPC-S_ENG_Gbx3_drag.vecto => IEPC-S__Gbx3_drag.vecto} (100%)
 rename VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/{BEV_ENG.vecto => BEV_.vecto} (100%)

diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
index 2af61a3c14..a7fdb60794 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC__Gbx1Axl.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_ENG_Gbx1Axl.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC__Gbx1Axl.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
index 42ce674fd5..da41171877 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC__Gbx1Whl1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC_ENG_Gbx1Whl1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPC__Gbx1Whl1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
index 549a74ffeb..24dbd219f4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPCVehicle_Gbx1Whl2.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC__Gbx1Whl2.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC_ENG_Gbx1Whl2.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl2/IEPC__Gbx1Whl2.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
index ed5013cd4e..882d9334de 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPCVehicle_Gbx1.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC_ENG_Gbx1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx1Speed/IEPC__Gbx1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
index 592bd8db31..b238d067f1 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPCVehicle_Gbx3Axl.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC__Gbx3Axl.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC_ENG_Gbx3Axl.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed+Axle/IEPC__Gbx3Axl.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
index f9dfee2907..ebb94f2ae2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -47,7 +47,7 @@
     "VehicleHeight": 3.0,
     "InitialSoC": 80.0,
     "PowertrainConfiguration": "IEPC_E",
-    "IEPC": "E:\\QUAM\\Workspace\\VECTO_DEV_Buses\\VectoCore\\VectoCoreTest\\TestData\\Integration\\DeclarationMode\\2nd_AmendmDeclMode\\JSON\\PEV\\GenericIEPC\\IEPC_Gbx3Speed-Whl1\\GenericIEPC_Gbx3Whl1.viepc",
+    "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
     "Batteries": [
       {
         "NumPacks": 1,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC__Gbx3Whl1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC__Gbx3Whl1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
index 929b4da87b..6f52df74fe 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPCVehicle_Gbx3Whl2.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC__Gbx3Whl2.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC_ENG_Gbx3Whl2.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl2/IEPC__Gbx3Whl2.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
index faf423be65..5de96f6c36 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
index 020bbe1b2d..608b14a08d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3_drag.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3_drag.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC_ENG_Gbx3_drag.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPC__Gbx3_drag.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_3speed.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_3speed.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed_PTO.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_3speed_PTO.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__3speed_PTO.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_BusAux.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_BusAux.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__BusAux.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV_ENG_Cont30kW.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BEV__Cont30kW.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh
index 0f3f581bae..1607a719e4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
index 79302a46b1..b2712b0384 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
index 53a7a966cf..4f717cc2df 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2/BatteryElectricVehicle_PTO.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
index 994126be15..8212b9e8c9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_APTN/BEV_B2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "Tractor",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 10143.4,
     "CurbWeightExtra": 7500.0,
     "MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
index 994126be15..8212b9e8c9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "Tractor",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 10143.4,
     "CurbWeightExtra": 7500.0,
     "MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
index 641cf4a30c..6acf57eb43 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB2_AT/BEV_B2_Group5_LH_rl_APTP.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "Tractor",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 10143.4,
     "CurbWeightExtra": 7500.0,
     "MassMax": 18.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV__Cont30kW.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV_ENG_Cont30kW.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BEV__Cont30kW.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh
index d8a85ea4a4..e87705c16d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
index b6ac5d9b28..490f038699 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB3/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_ENG_Cont30kW.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV__Cont30kW.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV_ENG_Cont30kW.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BEV__Cont30kW.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh
index 72e8736b5c..bbf5322c96 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
index e11782135a..26a08321e4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh
index 0f3f581bae..1607a719e4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
index 79302a46b1..b2712b0384 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
@@ -8,7 +8,7 @@
 	"Body": {
 		"SavedInDeclMode": true,
 		"VehCat": "RigidTruck",
-		"LegislativeClass": "Unknown",
+		"LegislativeClass": "N3",
 		"CurbWeight": 4670.0,
 		"CurbWeightExtra": 1900.0,
 		"Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
index 03972e7974..6eb23870d6 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh
index e53235bb82..ed4bf4082f 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "MassMax": 11.99,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
index 72e8736b5c..bbf5322c96 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
@@ -8,7 +8,7 @@
   "Body": {
     "SavedInDeclMode": true,
     "VehCat": "RigidTruck",
-    "LegislativeClass": "Unknown",
+    "LegislativeClass": "N3",
     "CurbWeight": 4670.0,
     "CurbWeightExtra": 1900.0,
     "Loading": 3020.0,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S_ENG_Gbx1Axl.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S__Gbx1Whl1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S_ENG_Gbx1Whl1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S__Gbx1Whl1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S__Gbx1Whl2.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S_ENG_Gbx1Whl2.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S__Gbx1Whl2.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S__Gbx1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S_ENG_Gbx1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S__Gbx1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S__Gbx3Axl.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S_ENG_Gbx3Axl.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S__Gbx3Axl.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S_ENG_Gbx3Whl1.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S__Gbx3Whl2.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S_ENG_Gbx3Whl2.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S__Gbx3Whl2.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3_drag.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S_ENG_Gbx3_drag.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3_drag.vecto
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_.vecto
similarity index 100%
rename from VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_.vecto
-- 
GitLab