updating update generic S4 job as saved via GUI

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/209kW_7c7l.veng

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2021-06-17T07:29:46.1581600Z",
+    "Date": "2023-02-16T13:50:06.2521955Z",
     "AppVersion": "3",
     "FileVersion": 5
   },
@@ -10,7 +10,7 @@
     "ModelName": "209kW 7.7l Engine",
     "Displacement": "7700",
     "IdlingSpeed": 600.0,
-    "Inertia": 3.33,
+    "Inertia": 2.489,
     "Fuels": [
       {
         "WHTC-Urban": 1.0097,
@@ -23,9 +23,9 @@
         "FuelType": "DieselCI"
       }
     ],
-    "RatedPower": 209000,
+    "RatedPower": 209000.0,
     "RatedSpeed": 2550.0,
-    "MaxTorque": 1100,
+    "MaxTorque": 1100.0,
     "FullLoadCurve": "209kW_ICE_fld.vfld",
     "WHRType": [
       "None"

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/GenericBattery.vreess

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2021-06-16T09:37:48.3166199Z",
+    "Date": "2023-02-16T12:52:53.9081708Z",
     "AppVersion": "3",
     "FileVersion": 1
   },
@@ -10,10 +10,13 @@
     "REESSType": "Battery",
     "Model": "Generic Battery",
     "Capacity": 68.75,
-    "SOC_min": 20,
-    "SOC_max": 80,
+    "SOC_min": 20.0,
+    "SOC_max": 80.0,
     "MaxCurrentMap": "MaxCurrent.vimax",
     "InternalResistanceCurve": "GenericBattery.vbatr",
-    "SoCCurve": "REESS_SOC_curve.vbatv"
+    "SoCCurve": "REESS_SOC_curve.vbatv",
+    "TestingTemperature": 20.0,
+    "JunctionboxIncluded": false,
+    "ConnectorsSubsystemsIncluded": false
   }
 }
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/GenericEM.vem

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2021-08-05T14:49:40.5920495Z",
+    "Date": "2023-02-17T07:43:01.3002618Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": true,
     "Model": "Generic Electric Motor",
     "Inertia": 0.134,
-    "ContinuousTorque": 437,
-    "ContinuousTorqueSpeed": 3500,
-    "OverloadTorque": 500,
-    "OverloadTorqueSpeed": 3500,
-    "OverloadTime": 120,
+    "ElectricMachineType": "ESM",
     "ThermalOverloadRecoveryFactor": 0.9,
-    "R85RatedPower": 183259.5715,
+    "R85RatedPower": 18.32,
+    "DragCurve": "EM_drag.vemd",
     "VoltageLevels": [
       {
         "Voltage": 0.0,
+        "ContinuousTorque": 437.0,
+        "ContinuousTorqueSpeed": "3500",
+        "OverloadTorque": 500.0,
+        "OverloadTorqueSpeed": 3500.0,
+        "OverloadTime": 120.0,
         "FullLoadCurve": "EM_fld.vemp",
-        "DragCurve": "EM_drag.vemd",
-        "EfficiencyMap": "EM_Map.vemo"
+        "EfficiencyMap": {
+          "0": "EM_Map.vemo"
+        }
       },
       {
         "Voltage": 1000.0,
+        "ContinuousTorque": 437.0,
+        "ContinuousTorqueSpeed": "3500",
+        "OverloadTorque": 500.0,
+        "OverloadTorqueSpeed": 3500.0,
+        "OverloadTime": 120.0,
         "FullLoadCurve": "EM_fld.vemp",
-        "DragCurve": "EM_drag.vemd",
-        "EfficiencyMap": "EM_Map.vemo"
+        "EfficiencyMap": {
+          "0": "EM_Map.vemo"
+        }
       }
     ]
   }

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/GenericGen.vem

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2021-08-05T14:49:40.5920495Z",
+    "Date": "2023-02-16T12:53:11.5458304Z",
     "AppVersion": "3",
-    "FileVersion": 3
+    "FileVersion": 5
   },
   "Body": {
     "SavedInDeclMode": true,
     "Model": "Generic Electric Motor",
     "Inertia": 0.134,
-    "ContinuousTorque": 798,
-    "ContinuousTorqueSpeed": 1850,
-    "OverloadTorque": 1030,
-    "OverloadTorqueSpeed": 1850,
-    "OverloadTime": 120,
+    "ElectricMachineType": "PSM",
     "ThermalOverloadRecoveryFactor": 0.9,
     "R85RatedPower": 199.0,
+    "DragCurve": "Gen_drag.vemd",
     "VoltageLevels": [
       {
         "Voltage": 0.0,
+        "ContinuousTorque": 798.0,
+        "ContinuousTorqueSpeed": "1850",
+        "OverloadTorque": 1030.0,
+        "OverloadTorqueSpeed": 1850.0,
+        "OverloadTime": 120.0,
         "FullLoadCurve": "Gen_fld.vemp",
-        "DragCurve": "Gen_drag.vemd",
-        "EfficiencyMap": "Gen_Map.vemo"
+        "EfficiencyMap": {
+          "0": "Gen_Map.vemo"
+        }
       },
       {
         "Voltage": 1000.0,
+        "ContinuousTorque": 798.0,
+        "ContinuousTorqueSpeed": "1850",
+        "OverloadTorque": 1030.0,
+        "OverloadTorqueSpeed": 1850.0,
+        "OverloadTime": 120.0,
         "FullLoadCurve": "Gen_fld.vemp",
-        "DragCurve": "Gen_drag.vemd",
-        "EfficiencyMap": "Gen_Map.vemo"
+        "EfficiencyMap": {
+          "0": "Gen_Map.vemo"
+        }
       }
     ]
   }

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vecto

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2022-02-08T08:23:21.5081224Z",
+    "Date": "2023-02-17T07:43:05.2713986Z",
     "AppVersion": "3",
     "FileVersion": 11
   },
   "Body": {
     "SavedInDeclMode": true,
-    "EngineOnlyMode": false,
     "VehicleFile": "SerialHybrid_S4.vveh",
     "EngineFile": "209kW_7c7l.veng",
-    "HybridStrategyParams": "Hybrid_Parameters.vhctl",
-    "Padd_electric": 0.0,
-    "VACC": "Truck.vacc",
-    "EngineStopStartAtVehicleStopThreshold": 2.0,
-    "EngineStopStartMaxOffTimespan": 120.0,
-    "EngineStopStartUtilityFactor": 0.8,
-    "EngineStopStartUtilityFactorDriving": 0.8,
-    "EcoRollMinSpeed": 60.000000000000007,
-    "EcoRollActivationDelay": 2.0,
-    "EcoRollUnderspeedThreshold": 0.0,
-    "EcoRollMaxAcceleration": 0.1,
-    "PCCEnableSpeed": 80.0,
-    "PCCMinSpeed": 50.0,
-    "PCCUnderspeed": 8.0,
-    "PCCOverSpeed": 5.0,
-    "PCCPreviewDistanceUC1": 1500.0,
-    "PCCPreviewDistanceUC2": 1000.0,
-    "LAC": {
-      "Enabled": true,
-      "PreviewDistanceFactor": 10.0,
-      "DF_offset": 2.5,
-      "DF_scaling": 1.5,
-      "DF_targetSpeedLookup": "",
-      "Df_velocityDropLookup": "",
-      "MinSpeed": 50.0
-    },
-    "OverSpeedEcoRoll": {
-      "Mode": "Overspeed",
-      "MinSpeed": 50.0,
-      "OverSpeed": 2.5
-    },
-    "Cycles": [
-      "LongHaul",
-      "RegionalDelivery",
-      "UrbanDelivery",
-      "Construction",
-      "Urban",
-      "Suburban",
-      "Interurban",
-      "Coach"
-    ],
     "Aux": [
       {
         "ID": "FAN",
@@ -88,5 +46,10 @@
         ]
       }
     ],
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 2.5
+    }
   }
 }
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S4_Job/SerialHybrid_S4.vveh

 {
   "Header": {
     "CreatedBy": "",
-    "Date": "2022-02-08T08:23:19.3752854Z",
+    "Date": "2023-02-17T07:43:02.6082253Z",
     "AppVersion": "3",
     "FileVersion": 10
   },
@@ -12,8 +12,8 @@
     "CurbWeight": 12841.5,
     "CurbWeightExtra": 0.0,
     "MassMax": 19.5,
-    "Loading": 5618.16,
-    "rdyn": 465.0,
+    "Loading": 0.0,
+    "rdyn": 0.0,
     "CdCorrMode": "CdofVdecl",
     "CdCorrFile": "",
     "AxleConfig": {
@@ -22,7 +22,7 @@
         {
           "Inertia": 11.9,
           "Wheels": "275/70 R22.5",
-          "AxleWeightShare": 0.375,
+          "AxleWeightShare": 0.0,
           "TwinTyres": false,
           "RRCISO": 0.0034,
           "FzISO": 31300.0,
@@ -31,7 +31,7 @@
         {
           "Inertia": 11.9,
           "Wheels": "275/70 R22.5",
-          "AxleWeightShare": 0.625,
+          "AxleWeightShare": 0.0,
           "TwinTyres": true,
           "RRCISO": 0.004,
           "FzISO": 31300.0,
@@ -50,7 +50,8 @@
       "Ratio": 1.0,
       "File": ""
     },
-    "InitialSoC": 80,
+    "TankSystem": "Compressed",
+    "InitialSoC": 80.0,
     "PowertrainConfiguration": "SerialHybrid",
     "ElectricMotors": [
       {
@@ -62,10 +63,10 @@
       },
       {
         "Count": 1,
-        "Ratio": 1,
+        "Ratio": 1.0,
         "Position": "GEN",
         "MotorFile": "GenericGen.vem",
-        "MechanicalEfficiency": 1
+        "MechanicalEfficiency": 1.0
       }
     ],
     "Batteries": [
@@ -74,6 +75,8 @@
         "BatteryFile": "GenericBattery.vreess",
         "StreamId": 0
       }
-    ]
+    ],
+    "OvcHev": false,
+    "MaxChargingPower": 0.0
   }
 }
\ No newline at end of file