diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/12SpeedGbx/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/GenericIHPC/6SpeedGbx/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng
index e19874dff87df420968485d5d5703fe424d27579..de7baa3cc32ffbab90119bd6749176a2901e3d33 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Engine_175kW_6.8l.veng
@@ -17,6 +17,6 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 0.0
+    "ColdHotBalancingFactor": 1.0
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng
index 70ecc246a4bbc357edcd6ed2c90fa7aaff2fffbd..34612a508a23e7527c16751f8aa0fdc894fe6381 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2_EM/Engine_175kW_6.8l.veng
@@ -16,6 +16,6 @@
         "WHTC-Urban": 1.0097,
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
-    "ColdHotBalancingFactor": 0.0
+    "ColdHotBalancingFactor": 1.0
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng
index b5f4f4af1c05a887b248b1834b32d3e8d1c73e3b..3fbbeb9f0e237a36d52ce6b42cfa9954c96d94a2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng
index b5f4f4af1c05a887b248b1834b32d3e8d1c73e3b..3fbbeb9f0e237a36d52ce6b42cfa9954c96d94a2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng
index 8e16d939cd54f8b40bf79a247ac92b122d045bf9..48bcee7184c27481bc8e0fc350113d854313825a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng
index e03e40c09fdd0290499ee4f7481f672c8bbe02b1..00b7d37dfdc684751e33112827c5438d328794f9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/VKM/Engine_325kW_12.7l_WHR.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW_WHR.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2_BatSystem/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P4/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng
index fc8573fb7d362b5b48db26e1794b59884e024366..e2602a8477c39d3abf8bded6e45c23e9f0e2b6c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Engine_175kW_6.8l.veng
@@ -17,6 +17,6 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 0.0
+    "ColdHotBalancingFactor": 1.0
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng
index e19874dff87df420968485d5d5703fe424d27579..de7baa3cc32ffbab90119bd6749176a2901e3d33 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Engine_175kW_6.8l.veng
@@ -17,6 +17,6 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-    "ColdHotBalancingFactor": 0.0
+    "ColdHotBalancingFactor": 1.0
   }
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group5/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng
index a39e20cd17e323b309c7d5b3798d8a800313338c..0e75bad7db7ce989f7eeeb01df8df69e44271094 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P1-APT/Engine_175kW_6.8l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "175kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng
index 483b48264b8c19794715d7e69bb56d52eed9494d..c4a51621a6960cc5bf18bc646e6598c23f989cf5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/VKM/Engine_325kW_12.7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "325kW.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
index acc44d479b1611fc3d6152d703f3deecdabb054c..0cb3639d54c569524db3b590b01327438ee954d8 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/Common/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng
index 85eb5a35a8997de9cf94edce49812bd358692780..cbe4df0c5e50e3a031d0370250fa0e41b8d3ade4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0,
         "WHTC-Motorway": 1.0,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng
index 22a2d3a9e2c0341eb622305c09583c7e326e811f..3aa12641287d093d61f1812d3dd9643f963bb0d2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng
index 830af9bcf30a4dbfd2731ea45d141c3db735c3e4..60fc788afb4704e09abdd9f41b21ae87632f390d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_Sx/Group2_6l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 0.0,
         "WHTC-Motorway": 0.0,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "Group2_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng
index 85eb5a35a8997de9cf94edce49812bd358692780..cbe4df0c5e50e3a031d0370250fa0e41b8d3ade4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_APTN/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0,
         "WHTC-Motorway": 1.0,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng
index 86732a1a8812629339bf745cc43591c7e6d4fcca..e2abfd670a411c635a72d210e27ade7a9b7b169c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0035,
         "WHTC-Motorway": 1.0035,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng
index 4f4e49114aca508ce352dba61cf70cedf387ab94..70cb5d25fc8799cac30586d1ae33c1d22252d171 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/209kW_7c7l_WHR.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 1.0,
         "WHTC-Motorway": 1.0,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map_WHR.vmap",
         "FuelType": "DieselCI"
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng
index 0a713cd0c35f6fac3bd2650485b756fd094b61cf..e47d3115f03f24124ab7c4c0a3d3abe592cca3bd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/Sx_Job/209kW_7c7l.veng
@@ -17,7 +17,7 @@
         "WHTC-Rural": 0.0,
         "WHTC-Motorway": 0.0,
         "WHTC-Engineering": 1.0090832895,
-        "ColdHotBalancingFactor": 0.0,
+        "ColdHotBalancingFactor": 1.0,
         "CFRegPer": 1.0,
         "FuelMap": "209kW_ICE_Map.vmap",
         "FuelType": "DieselCI"