From 4629b8b2cd7520acc03dc7140c368b6ada8c8a7c Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 22 May 2017 11:12:57 +0200
Subject: [PATCH] adding testdata and testcase for declaration data adapter &
 class 9 PTO cycle

---
 .gitignore                                    |   2 +
 .../Class9_RigidTruck_6x2/324kW.vfld          |  11 +
 .../Class9_RigidTruck_6x2/350kW.vmap          | 107 ++++++
 .../Class9_RigidTruck_6x2/AMT_12.vgbx         | 117 +++++++
 .../Class9_RigidTruck_6x2/Axle_4x2.vtlm       | 317 ++++++++++++++++++
 .../Class9_RigidTruck.vveh                    |  65 ++++
 .../Class9_RigidTruck_DECL.vecto              |  61 ++++
 .../Engine_324kW_12.7l.veng                   |  22 ++
 .../Class9_RigidTruck_6x2/Gear_1.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_10.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_11.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_12.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_2.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_3.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_4.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_5.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_6.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_7.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_8.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_9.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Retarder.vrlm       |  32 ++
 VECTO/Input Files/Vehicle.vb                  |   2 +-
 .../DeclarationDataAdapter.cs                 |   8 +-
 .../DeclarationModeVectoRunDataFactory.cs     |   9 +-
 .../Integration/FullCycleDeclarationTest.cs   |  27 ++
 .../DeclarationAdapterTestHelper.cs           |  22 ++
 .../DeclarationDataAdapterTest_Class2.cs      | 127 +++++++
 .../DeclarationDataAdapterTest_Class5.cs      |  92 +++++
 .../DeclarationDataAdapterTest_Class9.cs      | 125 +++++++
 .../Class9_RigidTruck_6x2/324kW.vfld          |  11 +
 .../Class9_RigidTruck_6x2/350kW.vmap          | 107 ++++++
 .../Class9_RigidTruck_6x2/AMT_12.vgbx         | 117 +++++++
 .../Class9_RigidTruck_6x2/Axle_4x2.vtlm       | 317 ++++++++++++++++++
 .../Class9_RigidTruck.vveh                    |  65 ++++
 .../Class9_RigidTruck_DECL.vecto              |  61 ++++
 .../Engine_324kW_12.7l.veng                   |  22 ++
 .../Class9_RigidTruck_6x2/Gear_1.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_10.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_11.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_12.vtlm        | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_2.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_3.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_4.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_5.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_6.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_7.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_8.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Gear_9.vtlm         | 193 +++++++++++
 .../Class9_RigidTruck_6x2/Retarder.vrlm       |  32 ++
 VectoCore/VectoCoreTest/VectoCoreTest.csproj  | 187 +++++++++++
 50 files changed, 6687 insertions(+), 10 deletions(-)
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm
 create mode 100644 Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm
 create mode 100644 VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs
 create mode 100644 VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
 create mode 100644 VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
 create mode 100644 VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm

diff --git a/.gitignore b/.gitignore
index 3be324427c..76c46bc44d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,3 +195,5 @@ Generic Vehicles/**/*.vsum
 Generic Vehicles/**/*.pdf
 VectoCore/VectoCoreTest/TestData/XML/XSD/
 VectoCommon/VectoHashingTest/Testdata/XML/XSD/
+VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vmod
+VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vsum
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld
new file mode 100644
index 0000000000..d305e26d47
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld	
@@ -0,0 +1,11 @@
+engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]
+600,1258,-150,0.24
+800,1758,-155,0.47
+1000,2140,-165,0.58
+1200,2146,-179,0.53
+1400,2109,-203,0.46
+1600,1903,-235,0.349999999
+1800,1719,-264,0.2
+2000,1259,-301,0.11
+2100,1079,-320,0.11
+2200,0,-339,0.11
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap
new file mode 100644
index 0000000000..4ae21e4b8e
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap	
@@ -0,0 +1,107 @@
+engine speed [rpm],torque [Nm],fuel consumption [g/h]
+600,-150,0
+600,0,1459
+600,200,3358
+600,400,5498
+600,600,8101
+600,800,10014
+600,1000,12071
+600,1200,14400
+600,1282,15350
+800,-155,0
+800,0,1879
+800,200,4286
+800,400,7350
+800,600,10059
+800,800,13086
+800,1000,16015
+800,1200,19239
+800,1400,22426
+800,1600,25600
+800,1791,28905
+1000,-165,0
+1000,0,2865
+1000,200,5963
+1000,400,9198
+1000,600,12354
+1000,800,15965
+1000,1000,19864
+1000,1200,23530
+1000,1400,27202
+1000,1600,31165
+1000,1800,35103
+1000,2000,39360
+1000,2200,44120
+1000,2300,46836
+1200,-179,0
+1200,0,3307
+1200,200,6897
+1200,400,10651
+1200,600,14645
+1200,800,19115
+1200,1000,23677
+1200,1200,28180
+1200,1400,32431
+1200,1600,37000
+1200,1800,41691
+1200,2000,46915
+1200,2200,51783
+1200,2300,54932
+1400,-203,0
+1400,0,4306
+1400,200,8143
+1400,400,12723
+1400,600,17523
+1400,800,22288
+1400,1000,27093
+1400,1200,32536
+1400,1400,37746
+1400,1600,43194
+1400,1800,49453
+1400,2000,55750
+1400,2200,61072
+1400,2300,64377
+1600,-235,0
+1600,0,5209
+1600,200,9669
+1600,400,14838
+1600,600,20127
+1600,800,25894
+1600,1000,31631
+1600,1200,37248
+1600,1400,43450
+1600,1600,49752
+1600,1800,57020
+1600,2000,63914
+1600,2079,66520
+1800,-264,0
+1800,0,6409
+1800,200,11777
+1800,400,17320
+1800,600,23394
+1800,800,30501
+1800,1000,36378
+1800,1200,43079
+1800,1400,50250
+1800,1600,57436
+1800,1800,65157
+1800,1857,67574
+2000,-301,0
+2000,0,9127
+2000,200,14822
+2000,400,20655
+2000,600,27076
+2000,800,34188
+2000,1000,42837
+2000,1200,51018
+2000,1352,56618
+2100,-320,0
+2100,0,10470
+2100,200,16332
+2100,400,22396
+2100,600,28914
+2100,800,35717
+2100,1000,45643
+2100,1100,50653
+2200,-339,0
+2200,0,13444.59908
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
new file mode 100644
index 0000000000..9b717385f7
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx	
@@ -0,0 +1,117 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:19:13.4575457Z",
+    "AppVersion": "3",
+    "FileVersion": 6
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "tractor_12gear_example",
+    "Inertia": 0.0,
+    "TracInt": 1.0,
+    "Gears": [
+      {
+        "Ratio": 2.64,
+        "LossMap": "Axle_4x2.vtlm"
+      },
+      {
+        "Ratio": 14.93,
+        "LossMap": "Gear_1.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 11.64,
+        "LossMap": "Gear_2.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 9.02,
+        "LossMap": "Gear_3.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 7.04,
+        "LossMap": "Gear_4.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 5.64,
+        "LossMap": "Gear_5.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 4.4,
+        "LossMap": "Gear_6.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 3.39,
+        "LossMap": "Gear_7.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 2.65,
+        "LossMap": "Gear_8.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 2.05,
+        "LossMap": "Gear_9.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.6,
+        "LossMap": "Gear_10.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.28,
+        "LossMap": "Gear_11.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.0,
+        "LossMap": "Gear_12.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      }
+    ],
+    "TqReserve": 20.0,
+    "ShiftTime": 1.5,
+    "StartTqReserve": 20.0,
+    "StartSpeed": 1.3,
+    "StartAcc": 0.6,
+    "GearboxType": "AMT",
+    "TorqueConverter": {
+      "Enabled": false
+    },
+    "DownshiftAfterUpshiftDelay": 10.0,
+    "UpshiftAfterDownshiftDelay": 10.0,
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
new file mode 100644
index 0000000000..e11cbf7cdd
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm	
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
new file mode 100644
index 0000000000..b72b915743
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh	
@@ -0,0 +1,65 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:36:54.5380903Z",
+    "AppVersion": "3",
+    "FileVersion": 7
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "VehCat": "RigidTruck",
+    "CurbWeight": 9300.0,
+    "CurbWeightExtra": 0.0,
+    "Loading": 0.0,
+    "MassMax": 26.0,
+    "CdA": 5.2,
+    "rdyn": 0.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "Retarder": {
+      "Type": "secondary",
+      "Ratio": 1.0,
+      "File": "Retarder.vrlm"
+    },
+    "Angledrive": {
+      "Type": "None",
+      "Ratio": "NaN",
+      "LossMap": ""
+    },
+    "PTO": {
+      "Type": "drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",
+      "LossMap": "",
+      "Cycle": ""
+    },
+    "TorqueLimits": {},
+    "AxleConfig": {
+      "Type": "6x2",
+      "Axles": [
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": false,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        },
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": true,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        },
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": false,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
new file mode 100644
index 0000000000..ef46306882
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto	
@@ -0,0 +1,61 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:36:57.2458195Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "EngineOnlyMode": false,
+    "VehicleFile": "Class9_RigidTruck.vveh",
+    "EngineFile": "Engine_324kW_12.7l.veng",
+    "GearboxFile": "AMT_12.vgbx",
+    "AuxiliaryAssembly": "Classic",
+    "AuxiliaryVersion": "CLASSIC",
+    "AdvancedAuxiliaryFilePath": "",
+    "Aux": [
+      {
+        "ID": "FAN",
+        "Type": "Fan",
+        "Technology": [
+          "Crankshaft mounted - On/off clutch"
+        ]
+      },
+      {
+        "ID": "STP",
+        "Type": "Steering pump",
+        "Technology": [
+          "Fixed displacement with elec. control"
+        ]
+      },
+      {
+        "ID": "AC",
+        "Type": "HVAC",
+        "Technology": [
+          "Default"
+        ]
+      },
+      {
+        "ID": "ES",
+        "Type": "Electric System",
+        "Technology": [
+          "Standard technology"
+        ]
+      },
+      {
+        "ID": "PS",
+        "Type": "Pneumatic System",
+        "Technology": [
+          "Medium Supply 2-stage + ESS + AMS"
+        ]
+      }
+    ],
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 5.0,
+      "UnderSpeed": 5.0
+    }
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
new file mode 100644
index 0000000000..9c995ff80f
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng	
@@ -0,0 +1,22 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:13:02.2025457Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "324kW 7l Engine",
+    "Displacement": "7000",
+    "IdlingSpeed": 600.0,
+    "Inertia": 3.6,
+    "FullLoadCurve": "324kW.vfld",
+    "FuelMap": "350kW.vmap",
+    "WHTC-Urban": 1.0,
+    "WHTC-Rural": 1.0,
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0
+  }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm
new file mode 100644
index 0000000000..4dfffd693b
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-2457,23
+0,-117,12
+0,0,5
+0,59,6
+0,293,7
+0,527,8
+0,761,9
+0,995,11
+0,1229,12
+0,1463,13
+0,1697,14
+0,1931,15
+0,2165,16
+0,2399,18
+0,2633,19
+0,2867,20
+100,-2457,26
+100,-117,14
+100,0,6
+100,59,7
+100,293,8
+100,527,9
+100,761,11
+100,995,12
+100,1229,13
+100,1463,14
+100,1697,15
+100,1931,16
+100,2165,18
+100,2399,19
+100,2633,20
+100,2867,21
+300,-2457,28
+300,-117,16
+300,0,7
+300,59,8
+300,293,9
+300,527,11
+300,761,12
+300,995,13
+300,1229,14
+300,1463,15
+300,1697,16
+300,1931,18
+300,2165,19
+300,2399,20
+300,2633,21
+300,2867,22
+500,-2457,30
+500,-117,19
+500,0,8
+500,59,9
+500,293,11
+500,527,12
+500,761,13
+500,995,14
+500,1229,15
+500,1463,16
+500,1697,18
+500,1931,19
+500,2165,20
+500,2399,21
+500,2633,22
+500,2867,23
+700,-2457,33
+700,-117,21
+700,0,9
+700,59,11
+700,293,12
+700,527,13
+700,761,14
+700,995,15
+700,1229,16
+700,1463,18
+700,1697,19
+700,1931,20
+700,2165,21
+700,2399,22
+700,2633,23
+700,2867,25
+900,-2457,35
+900,-117,23
+900,0,10
+900,59,12
+900,293,13
+900,527,14
+900,761,15
+900,995,16
+900,1229,18
+900,1463,19
+900,1697,20
+900,1931,21
+900,2165,22
+900,2399,23
+900,2633,25
+900,2867,26
+1100,-2457,37
+1100,-117,26
+1100,0,11
+1100,59,13
+1100,293,14
+1100,527,15
+1100,761,16
+1100,995,18
+1100,1229,19
+1100,1463,20
+1100,1697,21
+1100,1931,22
+1100,2165,23
+1100,2399,25
+1100,2633,26
+1100,2867,27
+1300,-2457,40
+1300,-117,28
+1300,0,12
+1300,59,14
+1300,293,15
+1300,527,16
+1300,761,18
+1300,995,19
+1300,1229,20
+1300,1463,21
+1300,1697,22
+1300,1931,23
+1300,2165,25
+1300,2399,26
+1300,2633,27
+1300,2867,28
+1500,-2457,42
+1500,-117,30
+1500,0,13
+1500,59,15
+1500,293,16
+1500,527,18
+1500,761,19
+1500,995,20
+1500,1229,21
+1500,1463,22
+1500,1697,23
+1500,1931,25
+1500,2165,26
+1500,2399,27
+1500,2633,28
+1500,2867,29
+1700,-2457,44
+1700,-117,33
+1700,0,14
+1700,59,16
+1700,293,18
+1700,527,19
+1700,761,20
+1700,995,21
+1700,1229,22
+1700,1463,23
+1700,1697,25
+1700,1931,26
+1700,2165,27
+1700,2399,28
+1700,2633,29
+1700,2867,30
+1900,-2457,47
+1900,-117,35
+1900,0,15
+1900,59,18
+1900,293,19
+1900,527,20
+1900,761,21
+1900,995,22
+1900,1229,23
+1900,1463,25
+1900,1697,26
+1900,1931,27
+1900,2165,28
+1900,2399,29
+1900,2633,30
+1900,2867,32
+2100,-2457,49
+2100,-117,37
+2100,0,16
+2100,59,19
+2100,293,20
+2100,527,21
+2100,761,22
+2100,995,23
+2100,1229,25
+2100,1463,26
+2100,1697,27
+2100,1931,28
+2100,2165,29
+2100,2399,30
+2100,2633,32
+2100,2867,33
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm	
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm
new file mode 100644
index 0000000000..eb575b9997
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm	
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 60b8e368ab..f9acea20f6 100644
--- a/VECTO/Input Files/Vehicle.vb	
+++ b/VECTO/Input Files/Vehicle.vb	
@@ -110,7 +110,7 @@ Public Class Vehicle
 				Dim segment As Segment = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration,
 																		vehicle.GrossVehicleMassRating, vehicle.CurbMassChassis)
 				vehicleData = doa.CreateVehicleData(vehicle, vehicle, segment.Missions.First(),
-													segment.Missions.First().Loadings.First().Value, segment.VehicleHeight)
+													segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight)
 				retarderData = doa.CreateRetarderData(vehicle)
 				angledriveData = doa.CreateAngledriveData(vehicle, False)
 				ptoData = doa.CreatePTOTransmissionData(vehicle)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 59205f40b4..7612d7fc15 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -81,8 +81,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 		}
 
 		internal VehicleData CreateVehicleData(IVehicleDeclarationInputData data, IAirdragDeclarationInputData airdragData,
-			Mission mission, Kilogram loading,
-			Meter vehicleHeight)
+			Mission mission, Kilogram loading, Meter vehicleHeight, Kilogram municipalBodyWeight)
 		{
 			if (!data.SavedInDeclarationMode) {
 				WarnDeclarationMode("VehicleData");
@@ -90,7 +89,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 
 			var retVal = SetCommonVehicleData(data);
 			retVal.TrailerGrossVehicleWeight = mission.Trailer.Sum(t => t.TrailerGrossVehicleWeight).DefaultIfNull(0);
-			retVal.BodyAndTrailerWeight = mission.BodyCurbWeight + mission.Trailer.Sum(t => t.TrailerCurbWeight).DefaultIfNull(0);
+
+			retVal.BodyAndTrailerWeight = (mission.MissionType == MissionType.MunicipalUtility
+				? municipalBodyWeight
+				: mission.BodyCurbWeight) + mission.Trailer.Sum(t => t.TrailerCurbWeight).DefaultIfNull(0);
 			retVal.CurbWeight += retVal.BodyAndTrailerWeight;
 
 			retVal.Loading = loading;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 89d280cd9e..3fa0f6d571 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -72,8 +72,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
 
 			var tempVehicle = dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData,
-				segment.Missions.First(),
-				segment.Missions.First().Loadings.First().Value, segment.VehicleHeight);
+				segment.Missions.First(), segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight);
 			var engineData = dao.CreateEngineData(InputDataProvider.EngineInputData, InputDataProvider.GearboxInputData,
 				InputDataProvider.VehicleInputData.TorqueLimits);
 			var axlegearData = dao.CreateAxleGearData(InputDataProvider.AxleGearInputData, false);
@@ -88,8 +87,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 				var powertrainConfig = new VectoRunData() {
 					VehicleData =
 						dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData,
-							segment.Missions.First(),
-							segment.Missions.First().Loadings.First().Value, segment.VehicleHeight),
+							segment.Missions.First(), segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight),
 					EngineData = engineData,
 					GearboxData = gearboxData,
 					AxleGearData = axlegearData,
@@ -118,8 +116,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 						Loading = loading.Key,
 						VehicleData =
 							dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData, mission,
-								loading.Value,
-								segment.VehicleHeight),
+								loading.Value, segment.VehicleHeight, segment.MunicipalBodyWeight),
 						EngineData = engineData.Copy(),
 						GearboxData = gearboxData,
 						AxleGearData = axlegearData,
diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index 9d36d184cd..1a771b921a 100644
--- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -57,6 +57,10 @@ namespace TUGraz.VectoCore.Tests.Integration
 		public const string DeliveryTruck8GearDeclarationJob =
 			@"TestData\Integration\DeclarationMode\12t Truck\12t Delivery Truck_8gear.vecto";
 
+		public const string Class9RigidTruckPTOJob =
+			@"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+
+
 		[TestMethod]
 		public void Truck40t_LongHaulCycle_RefLoad()
 		{
@@ -328,5 +332,28 @@ namespace TUGraz.VectoCore.Tests.Integration
 
 			Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
 		}
+
+
+		[TestMethod]
+		public void DeclarationClass9PTOTest()
+		{
+			var inputData = JSONInputDataFactory.ReadJsonJob(Class9RigidTruckPTOJob);
+			var fileWriter = new FileOutputWriter(Class9RigidTruckPTOJob);
+			var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter) {
+				WriteModalResults = true
+			};
+			var sumData = new SummaryDataContainer(fileWriter);
+			var jobContainer = new JobContainer(sumData);
+			jobContainer.AddRuns(factory);
+
+			//var runs = jobContainer.Runs;
+
+			//runs[8].Run.Run();
+
+			jobContainer.Execute();
+			jobContainer.WaitFinished();
+
+			Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
+		}
 	}
 }
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs
new file mode 100644
index 0000000000..14cabbc84f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs
@@ -0,0 +1,22 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+	public class DeclarationAdapterTestHelper
+	{
+		public static void AssertVehicleData(VehicleData vehicleData, VehicleCategory vehicleCategory,
+			VehicleClass vehicleClass,
+			AxleConfiguration axleConfiguration, double wheelsInertia, double totalVehicleWeight, double totalRollResistance)
+		{
+			Assert.AreEqual(vehicleCategory, vehicleData.VehicleCategory, "VehicleCategory");
+			Assert.AreEqual(vehicleClass, vehicleData.VehicleClass, "VehicleClass");
+			Assert.AreEqual(axleConfiguration, vehicleData.AxleConfiguration, "AxleConfiguration");
+			Assert.AreEqual(totalVehicleWeight, vehicleData.TotalVehicleWeight.Value(), 1e-3, "TotalVehicleWeight");
+			Assert.AreEqual(wheelsInertia, vehicleData.WheelsInertia.Value(), 1e-6, "WheelsInertia");
+			Assert.AreEqual(totalRollResistance, vehicleData.TotalRollResistanceCoefficient, 1e-6, "TotalRollResistance");
+		}
+	}
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
new file mode 100644
index 0000000000..e3d149dd48
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
@@ -0,0 +1,127 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+	[TestFixture]
+	public class DeclarationDataAdapterTest_Class2
+	{
+		public const string Class2RigidTruckNoEMSJob =
+			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto";
+
+		public const int CurbWeight = 4670;
+
+		[TestCase(Class2RigidTruckNoEMSJob, 0)]
+		public void TestClass2_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			Assert.AreEqual(6, runData.Length);
+
+			// long haul, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 57,
+				totalVehicleWeight: CurbWeight + 1900 + 3400 + 603.917 + 710,
+				totalRollResistance: 0.006954);
+		}
+
+		[TestCase(Class2RigidTruckNoEMSJob, 1)]
+		public void TestClass2_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// long haul, ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 57,
+				totalVehicleWeight: CurbWeight + 1900 + 3400 + 4541.176 + 5325,
+				totalRollResistance: 0.0065733);
+		}
+
+
+		[TestCase(Class2RigidTruckNoEMSJob, 2)]
+		public void TestClass2_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 39,
+				totalVehicleWeight: CurbWeight + 1900 + 603.917,
+				totalRollResistance: 0.007461);
+		}
+
+		[TestCase(Class2RigidTruckNoEMSJob, 3)]
+		public void TestClass2_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 39,
+				totalVehicleWeight: CurbWeight + 1900 + 3019.588,
+				totalRollResistance: 0.007248);
+		}
+
+
+		[TestCase(Class2RigidTruckNoEMSJob, 4)]
+		public void TestClass2_Vehicle_UrbanDel_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// municipal, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 39,
+				totalVehicleWeight: CurbWeight + 1900 + 603.917,
+				totalRollResistance: 0.007461);
+		}
+
+		[TestCase(Class2RigidTruckNoEMSJob, 5)]
+		public void TestClass2_Vehicle_UrbanDel_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// municipal, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class2,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 39,
+				totalVehicleWeight: CurbWeight + 1900 + 3019.588,
+				totalRollResistance: 0.007248);
+		}
+	}
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
new file mode 100644
index 0000000000..524be959bb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
@@ -0,0 +1,92 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+	[TestFixture]
+	public class DeclarationDataAdapterTest_Class5
+	{
+		public const string Class5TractorNoEMS_PTOJob =
+			@"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto";
+
+		public const int CurbWeight = 8229;
+
+		[TestCase(Class5TractorNoEMS_PTOJob, 0)]
+		public void TestClass5_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			Assert.AreEqual(4, runData.Length);
+
+			// long haul, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.Tractor,
+				vehicleClass: VehicleClass.Class5,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 204.6,
+				totalVehicleWeight: CurbWeight + 7500 + 2600,
+				totalRollResistance: 0.0062662);
+		}
+
+		[TestCase(Class5TractorNoEMS_PTOJob, 1)]
+		public void TestClass5_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// long haul, ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.Tractor,
+				vehicleClass: VehicleClass.Class5,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 204.6,
+				totalVehicleWeight: CurbWeight + 7500 + 19300,
+				totalRollResistance: 0.00587322);
+		}
+
+
+		[TestCase(Class5TractorNoEMS_PTOJob, 2)]
+		public void TestClass5_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.Tractor,
+				vehicleClass: VehicleClass.Class5,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 204.6,
+				totalVehicleWeight: CurbWeight + 7500 + 2600,
+				totalRollResistance: 0.0062565);
+		}
+
+		[TestCase(Class5TractorNoEMS_PTOJob, 3)]
+		public void TestClass5_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.Tractor,
+				vehicleClass: VehicleClass.Class5,
+				axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+				wheelsInertia: 204.6,
+				totalVehicleWeight: CurbWeight + 7500 + 12900,
+				totalRollResistance: 0.0059836);
+		}
+	}
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
new file mode 100644
index 0000000000..6f3b506a25
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
@@ -0,0 +1,125 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+	[TestFixture]
+	public class DeclarationDataAdapterTest_Class9
+	{
+		public const string Class9RigidTruckNoEMS_PTOJob =
+			@"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 0)]
+		public void TestClass9_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			Assert.AreEqual(6, runData.Length);
+
+			// long haul, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 196,
+				totalVehicleWeight: 9300 + 2200 + 5400 + 2600,
+				totalRollResistance: 0.0059426);
+		}
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 1)]
+		public void TestClass9_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// long haul, ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 196,
+				totalVehicleWeight: 9300 + 2200 + 5400 + 19300,
+				totalRollResistance: 0.00558611);
+		}
+
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 2)]
+		public void TestClass9_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 119.2,
+				totalVehicleWeight: 9300 + 2200 + 1400,
+				totalRollResistance: 0.0059109);
+		}
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 3)]
+		public void TestClass9_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// regional del., ref load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 119.2,
+				totalVehicleWeight: 9300 + 2200 + 7100,
+				totalRollResistance: 0.0056986);
+		}
+
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 4)]
+		public void TestClass9_Vehicle_Municipal_LowLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// municipal, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 119.2,
+				totalVehicleWeight: 9300 + 6750 + 1200,
+				totalRollResistance: 0.0057417);
+		}
+
+		[TestCase(Class9RigidTruckNoEMS_PTOJob, 5)]
+		public void TestClass9_Vehicle_Municipal_RefLoad(string file, int runIdx)
+		{
+			var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+			var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+			var runData = dataReader.NextRun().ToArray();
+
+			// municipal, min load
+			DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+				vehicleCategory: VehicleCategory.RigidTruck,
+				vehicleClass: VehicleClass.Class9,
+				axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+				wheelsInertia: 119.2,
+				totalVehicleWeight: 9300 + 6750 + 6000,
+				totalRollResistance: 0.005602);
+		}
+	}
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld
new file mode 100644
index 0000000000..d305e26d47
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld
@@ -0,0 +1,11 @@
+engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]
+600,1258,-150,0.24
+800,1758,-155,0.47
+1000,2140,-165,0.58
+1200,2146,-179,0.53
+1400,2109,-203,0.46
+1600,1903,-235,0.349999999
+1800,1719,-264,0.2
+2000,1259,-301,0.11
+2100,1079,-320,0.11
+2200,0,-339,0.11
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap
new file mode 100644
index 0000000000..4ae21e4b8e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap
@@ -0,0 +1,107 @@
+engine speed [rpm],torque [Nm],fuel consumption [g/h]
+600,-150,0
+600,0,1459
+600,200,3358
+600,400,5498
+600,600,8101
+600,800,10014
+600,1000,12071
+600,1200,14400
+600,1282,15350
+800,-155,0
+800,0,1879
+800,200,4286
+800,400,7350
+800,600,10059
+800,800,13086
+800,1000,16015
+800,1200,19239
+800,1400,22426
+800,1600,25600
+800,1791,28905
+1000,-165,0
+1000,0,2865
+1000,200,5963
+1000,400,9198
+1000,600,12354
+1000,800,15965
+1000,1000,19864
+1000,1200,23530
+1000,1400,27202
+1000,1600,31165
+1000,1800,35103
+1000,2000,39360
+1000,2200,44120
+1000,2300,46836
+1200,-179,0
+1200,0,3307
+1200,200,6897
+1200,400,10651
+1200,600,14645
+1200,800,19115
+1200,1000,23677
+1200,1200,28180
+1200,1400,32431
+1200,1600,37000
+1200,1800,41691
+1200,2000,46915
+1200,2200,51783
+1200,2300,54932
+1400,-203,0
+1400,0,4306
+1400,200,8143
+1400,400,12723
+1400,600,17523
+1400,800,22288
+1400,1000,27093
+1400,1200,32536
+1400,1400,37746
+1400,1600,43194
+1400,1800,49453
+1400,2000,55750
+1400,2200,61072
+1400,2300,64377
+1600,-235,0
+1600,0,5209
+1600,200,9669
+1600,400,14838
+1600,600,20127
+1600,800,25894
+1600,1000,31631
+1600,1200,37248
+1600,1400,43450
+1600,1600,49752
+1600,1800,57020
+1600,2000,63914
+1600,2079,66520
+1800,-264,0
+1800,0,6409
+1800,200,11777
+1800,400,17320
+1800,600,23394
+1800,800,30501
+1800,1000,36378
+1800,1200,43079
+1800,1400,50250
+1800,1600,57436
+1800,1800,65157
+1800,1857,67574
+2000,-301,0
+2000,0,9127
+2000,200,14822
+2000,400,20655
+2000,600,27076
+2000,800,34188
+2000,1000,42837
+2000,1200,51018
+2000,1352,56618
+2100,-320,0
+2100,0,10470
+2100,200,16332
+2100,400,22396
+2100,600,28914
+2100,800,35717
+2100,1000,45643
+2100,1100,50653
+2200,-339,0
+2200,0,13444.59908
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx
new file mode 100644
index 0000000000..9b717385f7
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx
@@ -0,0 +1,117 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:19:13.4575457Z",
+    "AppVersion": "3",
+    "FileVersion": 6
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "tractor_12gear_example",
+    "Inertia": 0.0,
+    "TracInt": 1.0,
+    "Gears": [
+      {
+        "Ratio": 2.64,
+        "LossMap": "Axle_4x2.vtlm"
+      },
+      {
+        "Ratio": 14.93,
+        "LossMap": "Gear_1.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 11.64,
+        "LossMap": "Gear_2.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 9.02,
+        "LossMap": "Gear_3.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 7.04,
+        "LossMap": "Gear_4.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 5.64,
+        "LossMap": "Gear_5.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 4.4,
+        "LossMap": "Gear_6.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 3.39,
+        "LossMap": "Gear_7.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 2.65,
+        "LossMap": "Gear_8.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 2.05,
+        "LossMap": "Gear_9.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.6,
+        "LossMap": "Gear_10.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.28,
+        "LossMap": "Gear_11.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      },
+      {
+        "Ratio": 1.0,
+        "LossMap": "Gear_12.vtlm",
+        "ShiftPolygon": "",
+        "MaxTorque": "",
+        "MaxSpeed": ""
+      }
+    ],
+    "TqReserve": 20.0,
+    "ShiftTime": 1.5,
+    "StartTqReserve": 20.0,
+    "StartSpeed": 1.3,
+    "StartAcc": 0.6,
+    "GearboxType": "AMT",
+    "TorqueConverter": {
+      "Enabled": false
+    },
+    "DownshiftAfterUpshiftDelay": 10.0,
+    "UpshiftAfterDownshiftDelay": 10.0,
+    "UpshiftMinAcceleration": 0.1,
+    "PowershiftShiftTime": 0.8
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
new file mode 100644
index 0000000000..e11cbf7cdd
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
new file mode 100644
index 0000000000..b72b915743
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -0,0 +1,65 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:36:54.5380903Z",
+    "AppVersion": "3",
+    "FileVersion": 7
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "VehCat": "RigidTruck",
+    "CurbWeight": 9300.0,
+    "CurbWeightExtra": 0.0,
+    "Loading": 0.0,
+    "MassMax": 26.0,
+    "CdA": 5.2,
+    "rdyn": 0.0,
+    "CdCorrMode": "CdofVdecl",
+    "CdCorrFile": "",
+    "Retarder": {
+      "Type": "secondary",
+      "Ratio": 1.0,
+      "File": "Retarder.vrlm"
+    },
+    "Angledrive": {
+      "Type": "None",
+      "Ratio": "NaN",
+      "LossMap": ""
+    },
+    "PTO": {
+      "Type": "drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",
+      "LossMap": "",
+      "Cycle": ""
+    },
+    "TorqueLimits": {},
+    "AxleConfig": {
+      "Type": "6x2",
+      "Axles": [
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": false,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        },
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": true,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        },
+        {
+          "Inertia": 14.9,
+          "Wheels": "315/70 R22.5",
+          "AxleWeightShare": 0.0,
+          "TwinTyres": false,
+          "RRCISO": 0.0055,
+          "FzISO": 33350.0
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
new file mode 100644
index 0000000000..ef46306882
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
@@ -0,0 +1,61 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:36:57.2458195Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "EngineOnlyMode": false,
+    "VehicleFile": "Class9_RigidTruck.vveh",
+    "EngineFile": "Engine_324kW_12.7l.veng",
+    "GearboxFile": "AMT_12.vgbx",
+    "AuxiliaryAssembly": "Classic",
+    "AuxiliaryVersion": "CLASSIC",
+    "AdvancedAuxiliaryFilePath": "",
+    "Aux": [
+      {
+        "ID": "FAN",
+        "Type": "Fan",
+        "Technology": [
+          "Crankshaft mounted - On/off clutch"
+        ]
+      },
+      {
+        "ID": "STP",
+        "Type": "Steering pump",
+        "Technology": [
+          "Fixed displacement with elec. control"
+        ]
+      },
+      {
+        "ID": "AC",
+        "Type": "HVAC",
+        "Technology": [
+          "Default"
+        ]
+      },
+      {
+        "ID": "ES",
+        "Type": "Electric System",
+        "Technology": [
+          "Standard technology"
+        ]
+      },
+      {
+        "ID": "PS",
+        "Type": "Pneumatic System",
+        "Technology": [
+          "Medium Supply 2-stage + ESS + AMS"
+        ]
+      }
+    ],
+    "OverSpeedEcoRoll": {
+      "Mode": "Overspeed",
+      "MinSpeed": 50.0,
+      "OverSpeed": 5.0,
+      "UnderSpeed": 5.0
+    }
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
new file mode 100644
index 0000000000..9c995ff80f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
@@ -0,0 +1,22 @@
+{
+  "Header": {
+    "CreatedBy": " ()",
+    "Date": "2017-05-19T08:13:02.2025457Z",
+    "AppVersion": "3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "SavedInDeclMode": true,
+    "ModelName": "324kW 7l Engine",
+    "Displacement": "7000",
+    "IdlingSpeed": 600.0,
+    "Inertia": 3.6,
+    "FullLoadCurve": "324kW.vfld",
+    "FuelMap": "350kW.vmap",
+    "WHTC-Urban": 1.0,
+    "WHTC-Rural": 1.0,
+    "WHTC-Motorway": 1.0,
+    "WHTC-Engineering": 1.0,
+    "ColdHotBalancingFactor": 1.0
+  }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm
new file mode 100644
index 0000000000..4dfffd693b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-2457,23
+0,-117,12
+0,0,5
+0,59,6
+0,293,7
+0,527,8
+0,761,9
+0,995,11
+0,1229,12
+0,1463,13
+0,1697,14
+0,1931,15
+0,2165,16
+0,2399,18
+0,2633,19
+0,2867,20
+100,-2457,26
+100,-117,14
+100,0,6
+100,59,7
+100,293,8
+100,527,9
+100,761,11
+100,995,12
+100,1229,13
+100,1463,14
+100,1697,15
+100,1931,16
+100,2165,18
+100,2399,19
+100,2633,20
+100,2867,21
+300,-2457,28
+300,-117,16
+300,0,7
+300,59,8
+300,293,9
+300,527,11
+300,761,12
+300,995,13
+300,1229,14
+300,1463,15
+300,1697,16
+300,1931,18
+300,2165,19
+300,2399,20
+300,2633,21
+300,2867,22
+500,-2457,30
+500,-117,19
+500,0,8
+500,59,9
+500,293,11
+500,527,12
+500,761,13
+500,995,14
+500,1229,15
+500,1463,16
+500,1697,18
+500,1931,19
+500,2165,20
+500,2399,21
+500,2633,22
+500,2867,23
+700,-2457,33
+700,-117,21
+700,0,9
+700,59,11
+700,293,12
+700,527,13
+700,761,14
+700,995,15
+700,1229,16
+700,1463,18
+700,1697,19
+700,1931,20
+700,2165,21
+700,2399,22
+700,2633,23
+700,2867,25
+900,-2457,35
+900,-117,23
+900,0,10
+900,59,12
+900,293,13
+900,527,14
+900,761,15
+900,995,16
+900,1229,18
+900,1463,19
+900,1697,20
+900,1931,21
+900,2165,22
+900,2399,23
+900,2633,25
+900,2867,26
+1100,-2457,37
+1100,-117,26
+1100,0,11
+1100,59,13
+1100,293,14
+1100,527,15
+1100,761,16
+1100,995,18
+1100,1229,19
+1100,1463,20
+1100,1697,21
+1100,1931,22
+1100,2165,23
+1100,2399,25
+1100,2633,26
+1100,2867,27
+1300,-2457,40
+1300,-117,28
+1300,0,12
+1300,59,14
+1300,293,15
+1300,527,16
+1300,761,18
+1300,995,19
+1300,1229,20
+1300,1463,21
+1300,1697,22
+1300,1931,23
+1300,2165,25
+1300,2399,26
+1300,2633,27
+1300,2867,28
+1500,-2457,42
+1500,-117,30
+1500,0,13
+1500,59,15
+1500,293,16
+1500,527,18
+1500,761,19
+1500,995,20
+1500,1229,21
+1500,1463,22
+1500,1697,23
+1500,1931,25
+1500,2165,26
+1500,2399,27
+1500,2633,28
+1500,2867,29
+1700,-2457,44
+1700,-117,33
+1700,0,14
+1700,59,16
+1700,293,18
+1700,527,19
+1700,761,20
+1700,995,21
+1700,1229,22
+1700,1463,23
+1700,1697,25
+1700,1931,26
+1700,2165,27
+1700,2399,28
+1700,2633,29
+1700,2867,30
+1900,-2457,47
+1900,-117,35
+1900,0,15
+1900,59,18
+1900,293,19
+1900,527,20
+1900,761,21
+1900,995,22
+1900,1229,23
+1900,1463,25
+1900,1697,26
+1900,1931,27
+1900,2165,28
+1900,2399,29
+1900,2633,30
+1900,2867,32
+2100,-2457,49
+2100,-117,37
+2100,0,16
+2100,59,19
+2100,293,20
+2100,527,21
+2100,761,22
+2100,995,23
+2100,1229,25
+2100,1463,26
+2100,1697,27
+2100,1931,28
+2100,2165,29
+2100,2399,30
+2100,2633,32
+2100,2867,33
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm
new file mode 100644
index 0000000000..211ceb1b69
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm
new file mode 100644
index 0000000000..eb575b9997
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 48e16a4e98..3c4fb4b0e4 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -95,6 +95,10 @@
     <Compile Include="Integration\DeclarationReportTest.cs" />
     <Compile Include="Integration\ShiftStrategy\ShiftStrategyTest.cs" />
     <Compile Include="Integration\TorqueLimitsTest.cs" />
+    <Compile Include="Models\Declaration\DataAdapter\DeclarationAdapterTestHelper.cs" />
+    <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class5.cs" />
+    <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class2.cs" />
+    <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class9.cs" />
     <Compile Include="Models\Declaration\ShiftPolygonTest.cs" />
     <Compile Include="Models\SimulationComponentData\TorqueConverterDataTest.cs" />
     <Compile Include="Models\SimulationComponentData\ValidationTest.cs" />
@@ -885,6 +889,189 @@
     <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\MT_6.vgbx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\325kW.vfld">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\325kW.vmap">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\AMT_12.vgbx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Axle_4x2_Tractor.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor.vveh">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vsum">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Default.vrlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Engine_325kW_12.7l.veng">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_1.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_10.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_11.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_12.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_2.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_3.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_4.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_5.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_6.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_7.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_8.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_9.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\325kW.vfld">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\325kW.vmap">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\AMT_12_topTorque.vgbx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Axle_4x2_Tractor.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Class5_Tractor_topTorque.vveh">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Class5_Tractor_TopTorque_DECL.vecto">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Default.vrlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Engine_325kW_12.7l.veng">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_1.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_10.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_11.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_12.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_2.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_3.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_4.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_5.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_6.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_7.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_8.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_9.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\324kW.vfld">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\350kW.vmap">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\AMT_12.vgbx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Axle_4x2.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck.vveh">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Engine_324kW_12.7l.veng">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_1.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_10.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_11.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_12.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_2.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_3.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_4.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_5.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_6.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_7.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_8.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_9.vtlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Retarder.vrlm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateAtBrake_80_0_level.vdri" />
     <None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateBeforeBrake_80_0_level.vdri" />
     <None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateWhileBrake_80_0_level.vdri" />
-- 
GitLab