diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index 615ed911f1317b1f755f7dc7177444f962862d49..923f507498fbac11bfb7e995df1266badfbe7ed5 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -370,28 +370,28 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, WithinSegment, Accelerate),      // len: 103m
 			(4591, 4606, WithinSegment, Roll),            // len: 15m
 			(4606, 4667, WithinSegment, Accelerate),      // len: 61m
-			(4667, 4679, WithinSegment, Roll),            // len: 12m
-			(4679, 4721, WithinSegment, Accelerate),      // len: 42m
+			(4667, 4678, WithinSegment, Roll),            // len: 11m
+			(4678, 4721, WithinSegment, Accelerate),      // len: 43m
 			(4721, 4730, WithinSegment, Roll),            // len: 9m
-			(4730, 4762, WithinSegment, Accelerate),      // len: 32m
-			(4762, 4769, WithinSegment, Roll),            // len: 7m
-			(4769, 4796, WithinSegment, Accelerate),      // len: 27m
-			(4796, 4801, WithinSegment, Roll),            // len: 5m
-			(4801, 4930, WithinSegment, Accelerate),      // len: 129m
-			(4930, 4937, WithinSegment, Roll),            // len: 7m
-			(4937, 5053, WithinSegment, Accelerate),      // len: 116m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5099, WithinSegment, Accelerate),      // len: 34m
-			(5099, 5113, WithinSegment, Roll),            // len: 14m
-			(5113, 5227, WithinSegment, Accelerate),      // len: 114m
-			(5227, 5245, WithinSegment, Roll),            // len: 18m
-			(5245, 5364, WithinSegment, Accelerate),      // len: 119m
-			(5364, 5692, UseCase2, Coast),                // len: 328m
-			(5692, 5947, WithinSegment, Coast),           // len: 255m
-			(5947, 6120, WithinSegment, Brake),           // len: 173m
-			(6120, 6132, WithinSegment, Coast),           // len: 12m
-			(6132, 6520, OutsideSegment, Coast),          // len: 388m
-			(6520, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, WithinSegment, Accelerate),      // len: 28m
+			(4758, 4765, WithinSegment, Roll),            // len: 7m
+			(4765, 4799, WithinSegment, Accelerate),      // len: 34m
+			(4799, 4804, WithinSegment, Roll),            // len: 5m
+			(4804, 4932, WithinSegment, Accelerate),      // len: 128m
+			(4932, 4939, WithinSegment, Roll),            // len: 7m
+			(4939, 5050, WithinSegment, Accelerate),      // len: 111m
+			(5050, 5062, WithinSegment, Roll),            // len: 12m
+			(5062, 5095, WithinSegment, Accelerate),      // len: 33m
+			(5095, 5109, WithinSegment, Roll),            // len: 14m
+			(5109, 5231, WithinSegment, Accelerate),      // len: 122m
+			(5231, 5250, WithinSegment, Roll),            // len: 19m
+			(5250, 5369, WithinSegment, Accelerate),      // len: 119m
+			(5369, 5674, UseCase2, Coast),                // len: 305m
+			(5674, 5929, WithinSegment, Coast),           // len: 255m
+			(5929, 6114, WithinSegment, Brake),           // len: 185m
+			(6114, 6127, WithinSegment, Coast),           // len: 13m
+			(6127, 6515, OutsideSegment, Coast),          // len: 388m
+			(6515, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
 		public void Class5_PCC123_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -525,28 +525,28 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, WithinSegment, Accelerate),      // len: 103m
 			(4591, 4606, WithinSegment, Roll),            // len: 15m
 			(4606, 4667, WithinSegment, Accelerate),      // len: 61m
-			(4667, 4679, WithinSegment, Roll),            // len: 12m
-			(4679, 4721, WithinSegment, Accelerate),      // len: 42m
+			(4667, 4678, WithinSegment, Roll),            // len: 11m
+			(4678, 4721, WithinSegment, Accelerate),      // len: 43m
 			(4721, 4730, WithinSegment, Roll),            // len: 9m
-			(4730, 4762, WithinSegment, Accelerate),      // len: 32m
-			(4762, 4769, WithinSegment, Roll),            // len: 7m
-			(4769, 4796, WithinSegment, Accelerate),      // len: 27m
-			(4796, 4801, WithinSegment, Roll),            // len: 5m
-			(4801, 4930, WithinSegment, Accelerate),      // len: 129m
-			(4930, 4937, WithinSegment, Roll),            // len: 7m
-			(4937, 5053, WithinSegment, Accelerate),      // len: 116m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5099, WithinSegment, Accelerate),      // len: 34m
-			(5099, 5113, WithinSegment, Roll),            // len: 14m
-			(5113, 5227, WithinSegment, Accelerate),      // len: 114m
-			(5227, 5245, WithinSegment, Roll),            // len: 18m
-			(5245, 5364, WithinSegment, Accelerate),      // len: 119m
-			(5364, 5692, UseCase2, Coast),                // len: 328m
-			(5692, 5751, WithinSegment, Coast),           // len: 59m
-			(5751, 6124, WithinSegment, Brake),           // len: 373m
-			(6124, 6136, WithinSegment, Coast),           // len: 12m
-			(6136, 6409, OutsideSegment, Coast),          // len: 273m
-			(6409, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, WithinSegment, Accelerate),      // len: 28m
+			(4758, 4765, WithinSegment, Roll),            // len: 7m
+			(4765, 4799, WithinSegment, Accelerate),      // len: 34m
+			(4799, 4804, WithinSegment, Roll),            // len: 5m
+			(4804, 4932, WithinSegment, Accelerate),      // len: 128m
+			(4932, 4939, WithinSegment, Roll),            // len: 7m
+			(4939, 5050, WithinSegment, Accelerate),      // len: 111m
+			(5050, 5062, WithinSegment, Roll),            // len: 12m
+			(5062, 5095, WithinSegment, Accelerate),      // len: 33m
+			(5095, 5109, WithinSegment, Roll),            // len: 14m
+			(5109, 5231, WithinSegment, Accelerate),      // len: 122m
+			(5231, 5250, WithinSegment, Roll),            // len: 19m
+			(5250, 5369, WithinSegment, Accelerate),      // len: 119m
+			(5369, 5674, UseCase2, Coast),                // len: 305m
+			(5674, 5746, WithinSegment, Coast),           // len: 72m
+			(5746, 6130, WithinSegment, Brake),           // len: 384m
+			(6130, 6404, OutsideSegment, Coast),          // len: 274m
+			(6404, 1e6, OutsideSegment, Accelerate));
+
 
 		[TestCase]
 		public void Class5_PCC12_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -669,26 +669,28 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, OutsideSegment, Accelerate),     // len: 103m
 			(4591, 4606, OutsideSegment, Roll),           // len: 15m
 			(4606, 4667, OutsideSegment, Accelerate),     // len: 61m
-			(4667, 4679, OutsideSegment, Roll),           // len: 12m
-			(4679, 4721, OutsideSegment, Accelerate),     // len: 42m
+			(4667, 4678, OutsideSegment, Roll),           // len: 11m
+			(4678, 4721, OutsideSegment, Accelerate),     // len: 43m
 			(4721, 4730, OutsideSegment, Roll),           // len: 9m
-			(4730, 4762, OutsideSegment, Accelerate),     // len: 32m
-			(4762, 4769, OutsideSegment, Roll),           // len: 7m
-			(4769, 4796, OutsideSegment, Accelerate),     // len: 27m
-			(4796, 4801, OutsideSegment, Roll),           // len: 5m
-			(4801, 4930, OutsideSegment, Accelerate),     // len: 129m
-			(4930, 4937, OutsideSegment, Roll),           // len: 7m
-			(4937, 5053, OutsideSegment, Accelerate),     // len: 116m
-			(5053, 5065, OutsideSegment, Roll),           // len: 12m
-			(5065, 5099, OutsideSegment, Accelerate),     // len: 34m
-			(5099, 5113, OutsideSegment, Roll),           // len: 14m
-			(5113, 5227, OutsideSegment, Accelerate),     // len: 114m
-			(5227, 5245, OutsideSegment, Roll),           // len: 18m
-			(5245, 5465, OutsideSegment, Accelerate),     // len: 220m
-			(5465, 5560, OutsideSegment, Coast),          // len: 95m
-			(5560, 6125, OutsideSegment, Brake),          // len: 565m
-			(6125, 6410, OutsideSegment, Coast),          // len: 285m
-			(6410, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, OutsideSegment, Accelerate),     // len: 28m
+			(4758, 4765, OutsideSegment, Roll),           // len: 7m
+			(4765, 4799, OutsideSegment, Accelerate),     // len: 34m
+			(4799, 4804, OutsideSegment, Roll),           // len: 5m
+			(4804, 4932, OutsideSegment, Accelerate),     // len: 128m
+			(4932, 4939, OutsideSegment, Roll),           // len: 7m
+			(4939, 5050, OutsideSegment, Accelerate),     // len: 111m
+			(5050, 5062, OutsideSegment, Roll),           // len: 12m
+			(5062, 5095, OutsideSegment, Accelerate),     // len: 33m
+			(5095, 5109, OutsideSegment, Roll),           // len: 14m
+			(5109, 5231, OutsideSegment, Accelerate),     // len: 122m
+			(5231, 5250, OutsideSegment, Roll),           // len: 19m
+			(5250, 5459, OutsideSegment, Accelerate),     // len: 209m
+			(5459, 5554, OutsideSegment, Coast),          // len: 95m
+			(5554, 6131, OutsideSegment, Brake),          // len: 577m
+			(6131, 6404, OutsideSegment, Coast),          // len: 273m
+			(6404, 1e6, OutsideSegment, Accelerate));
+
+
 
 		[TestCase]
 		public void Class5_NoADAS_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -830,26 +832,26 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, OutsideSegment, Accelerate),     // len: 103m
 			(4591, 4606, OutsideSegment, Roll),           // len: 15m
 			(4606, 4667, OutsideSegment, Accelerate),     // len: 61m
-			(4667, 4679, OutsideSegment, Roll),           // len: 12m
-			(4679, 4721, OutsideSegment, Accelerate),     // len: 42m
+			(4667, 4678, OutsideSegment, Roll),           // len: 11m
+			(4678, 4721, OutsideSegment, Accelerate),     // len: 43m
 			(4721, 4730, OutsideSegment, Roll),           // len: 9m
-			(4730, 4762, OutsideSegment, Accelerate),     // len: 32m
-			(4762, 4769, OutsideSegment, Roll),           // len: 7m
-			(4769, 4796, OutsideSegment, Accelerate),     // len: 27m
-			(4796, 4801, OutsideSegment, Roll),           // len: 5m
-			(4801, 4930, OutsideSegment, Accelerate),     // len: 129m
-			(4930, 4937, OutsideSegment, Roll),           // len: 7m
-			(4937, 5053, OutsideSegment, Accelerate),     // len: 116m
-			(5053, 5065, OutsideSegment, Roll),           // len: 12m
-			(5065, 5099, OutsideSegment, Accelerate),     // len: 34m
-			(5099, 5113, OutsideSegment, Roll),           // len: 14m
-			(5113, 5227, OutsideSegment, Accelerate),     // len: 114m
-			(5227, 5245, OutsideSegment, Roll),           // len: 18m
-			(5245, 5465, OutsideSegment, Accelerate),     // len: 220m
-			(5465, 5560, OutsideSegment, Coast),          // len: 95m
-			(5560, 6125, OutsideSegment, Brake),          // len: 565m
-			(6125, 6410, OutsideSegment, Coast),          // len: 285m
-			(6410, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, OutsideSegment, Accelerate),     // len: 28m
+			(4758, 4765, OutsideSegment, Roll),           // len: 7m
+			(4765, 4799, OutsideSegment, Accelerate),     // len: 34m
+			(4799, 4804, OutsideSegment, Roll),           // len: 5m
+			(4804, 4932, OutsideSegment, Accelerate),     // len: 128m
+			(4932, 4939, OutsideSegment, Roll),           // len: 7m
+			(4939, 5050, OutsideSegment, Accelerate),     // len: 111m
+			(5050, 5062, OutsideSegment, Roll),           // len: 12m
+			(5062, 5095, OutsideSegment, Accelerate),     // len: 33m
+			(5095, 5109, OutsideSegment, Roll),           // len: 14m
+			(5109, 5231, OutsideSegment, Accelerate),     // len: 122m
+			(5231, 5250, OutsideSegment, Roll),           // len: 19m
+			(5250, 5459, OutsideSegment, Accelerate),     // len: 209m
+			(5459, 5554, OutsideSegment, Coast),          // len: 95m
+			(5554, 6131, OutsideSegment, Brake),          // len: 577m
+			(6131, 6404, OutsideSegment, Coast),          // len: 273m
+			(6404, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
 		public void Class5_EcoRollWithoutEngineStop_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -992,26 +994,26 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, OutsideSegment, Accelerate),     // len: 103m
 			(4591, 4606, OutsideSegment, Roll),           // len: 15m
 			(4606, 4667, OutsideSegment, Accelerate),     // len: 61m
-			(4667, 4679, OutsideSegment, Roll),           // len: 12m
-			(4679, 4721, OutsideSegment, Accelerate),     // len: 42m
+			(4667, 4678, OutsideSegment, Roll),           // len: 11m
+			(4678, 4721, OutsideSegment, Accelerate),     // len: 43m
 			(4721, 4730, OutsideSegment, Roll),           // len: 9m
-			(4730, 4762, OutsideSegment, Accelerate),     // len: 32m
-			(4762, 4769, OutsideSegment, Roll),           // len: 7m
-			(4769, 4796, OutsideSegment, Accelerate),     // len: 27m
-			(4796, 4801, OutsideSegment, Roll),           // len: 5m
-			(4801, 4930, OutsideSegment, Accelerate),     // len: 129m
-			(4930, 4937, OutsideSegment, Roll),           // len: 7m
-			(4937, 5053, OutsideSegment, Accelerate),     // len: 116m
-			(5053, 5065, OutsideSegment, Roll),           // len: 12m
-			(5065, 5099, OutsideSegment, Accelerate),     // len: 34m
-			(5099, 5113, OutsideSegment, Roll),           // len: 14m
-			(5113, 5227, OutsideSegment, Accelerate),     // len: 114m
-			(5227, 5245, OutsideSegment, Roll),           // len: 18m
-			(5245, 5465, OutsideSegment, Accelerate),     // len: 220m
-			(5465, 5560, OutsideSegment, Coast),          // len: 95m
-			(5560, 6125, OutsideSegment, Brake),          // len: 565m
-			(6125, 6410, OutsideSegment, Coast),          // len: 285m
-			(6410, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, OutsideSegment, Accelerate),     // len: 28m
+			(4758, 4765, OutsideSegment, Roll),           // len: 7m
+			(4765, 4799, OutsideSegment, Accelerate),     // len: 34m
+			(4799, 4804, OutsideSegment, Roll),           // len: 5m
+			(4804, 4932, OutsideSegment, Accelerate),     // len: 128m
+			(4932, 4939, OutsideSegment, Roll),           // len: 7m
+			(4939, 5050, OutsideSegment, Accelerate),     // len: 111m
+			(5050, 5062, OutsideSegment, Roll),           // len: 12m
+			(5062, 5095, OutsideSegment, Accelerate),     // len: 33m
+			(5095, 5109, OutsideSegment, Roll),           // len: 14m
+			(5109, 5231, OutsideSegment, Accelerate),     // len: 122m
+			(5231, 5250, OutsideSegment, Roll),           // len: 19m
+			(5250, 5459, OutsideSegment, Accelerate),     // len: 209m
+			(5459, 5554, OutsideSegment, Coast),          // len: 95m
+			(5554, 6131, OutsideSegment, Brake),          // len: 577m
+			(6131, 6404, OutsideSegment, Coast),          // len: 273m
+			(6404, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
 		public void Class5_EcoRollEngineStop_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -1158,28 +1160,28 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, WithinSegment, Accelerate),      // len: 103m
 			(4591, 4606, WithinSegment, Roll),            // len: 15m
 			(4606, 4667, WithinSegment, Accelerate),      // len: 61m
-			(4667, 4679, WithinSegment, Roll),            // len: 12m
-			(4679, 4721, WithinSegment, Accelerate),      // len: 42m
+			(4667, 4678, WithinSegment, Roll),            // len: 11m
+			(4678, 4721, WithinSegment, Accelerate),      // len: 43m
 			(4721, 4730, WithinSegment, Roll),            // len: 9m
-			(4730, 4762, WithinSegment, Accelerate),      // len: 32m
-			(4762, 4769, WithinSegment, Roll),            // len: 7m
-			(4769, 4796, WithinSegment, Accelerate),      // len: 27m
-			(4796, 4801, WithinSegment, Roll),            // len: 5m
-			(4801, 4930, WithinSegment, Accelerate),      // len: 129m
-			(4930, 4937, WithinSegment, Roll),            // len: 7m
-			(4937, 5053, WithinSegment, Accelerate),      // len: 116m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5099, WithinSegment, Accelerate),      // len: 34m
-			(5099, 5113, WithinSegment, Roll),            // len: 14m
-			(5113, 5227, WithinSegment, Accelerate),      // len: 114m
-			(5227, 5245, WithinSegment, Roll),            // len: 18m
-			(5245, 5364, WithinSegment, Accelerate),      // len: 119m
-			(5364, 5623, UseCase2, Roll),                 // len: 259m
-			(5623, 5841, WithinSegment, Coast),           // len: 218m
-			(5841, 6113, WithinSegment, Brake),           // len: 272m
-			(6113, 6224, WithinSegment, Coast),           // len: 111m
-			(6224, 6514, OutsideSegment, Coast),          // len: 290m
-			(6514, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, WithinSegment, Accelerate),      // len: 28m
+			(4758, 4765, WithinSegment, Roll),            // len: 7m
+			(4765, 4799, WithinSegment, Accelerate),      // len: 34m
+			(4799, 4804, WithinSegment, Roll),            // len: 5m
+			(4804, 4932, WithinSegment, Accelerate),      // len: 128m
+			(4932, 4939, WithinSegment, Roll),            // len: 7m
+			(4939, 5050, WithinSegment, Accelerate),      // len: 111m
+			(5050, 5062, WithinSegment, Roll),            // len: 12m
+			(5062, 5095, WithinSegment, Accelerate),      // len: 33m
+			(5095, 5109, WithinSegment, Roll),            // len: 14m
+			(5109, 5231, WithinSegment, Accelerate),      // len: 122m
+			(5231, 5250, WithinSegment, Roll),            // len: 19m
+			(5250, 5369, WithinSegment, Accelerate),      // len: 119m
+			(5369, 5618, UseCase2, Roll),                 // len: 249m
+			(5618, 5836, WithinSegment, Coast),           // len: 218m
+			(5836, 6120, WithinSegment, Brake),           // len: 284m
+			(6120, 6231, WithinSegment, Coast),           // len: 111m
+			(6231, 6520, OutsideSegment, Coast),          // len: 289m
+			(6520, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
 		public void Class5_PCC123EcoRollWithoutEngineStop_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -1329,28 +1331,28 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 			(4488, 4591, WithinSegment, Accelerate),      // len: 103m
 			(4591, 4606, WithinSegment, Roll),            // len: 15m
 			(4606, 4667, WithinSegment, Accelerate),      // len: 61m
-			(4667, 4679, WithinSegment, Roll),            // len: 12m
-			(4679, 4721, WithinSegment, Accelerate),      // len: 42m
+			(4667, 4678, WithinSegment, Roll),            // len: 11m
+			(4678, 4721, WithinSegment, Accelerate),      // len: 43m
 			(4721, 4730, WithinSegment, Roll),            // len: 9m
-			(4730, 4762, WithinSegment, Accelerate),      // len: 32m
-			(4762, 4769, WithinSegment, Roll),            // len: 7m
-			(4769, 4796, WithinSegment, Accelerate),      // len: 27m
-			(4796, 4801, WithinSegment, Roll),            // len: 5m
-			(4801, 4930, WithinSegment, Accelerate),      // len: 129m
-			(4930, 4937, WithinSegment, Roll),            // len: 7m
-			(4937, 5053, WithinSegment, Accelerate),      // len: 116m
-			(5053, 5065, WithinSegment, Roll),            // len: 12m
-			(5065, 5099, WithinSegment, Accelerate),      // len: 34m
-			(5099, 5113, WithinSegment, Roll),            // len: 14m
-			(5113, 5227, WithinSegment, Accelerate),      // len: 114m
-			(5227, 5245, WithinSegment, Roll),            // len: 18m
-			(5245, 5364, WithinSegment, Accelerate),      // len: 119m
-			(5364, 5623, UseCase2, Roll),                 // len: 259m
-			(5623, 5841, WithinSegment, Coast),           // len: 218m
-			(5841, 6113, WithinSegment, Brake),           // len: 272m
-			(6113, 6225, WithinSegment, Coast),           // len: 112m
-			(6225, 6514, OutsideSegment, Coast),          // len: 289m
-			(6514, 1e6, OutsideSegment, Accelerate));
+			(4730, 4758, WithinSegment, Accelerate),      // len: 28m
+			(4758, 4765, WithinSegment, Roll),            // len: 7m
+			(4765, 4799, WithinSegment, Accelerate),      // len: 34m
+			(4799, 4804, WithinSegment, Roll),            // len: 5m
+			(4804, 4932, WithinSegment, Accelerate),      // len: 128m
+			(4932, 4939, WithinSegment, Roll),            // len: 7m
+			(4939, 5050, WithinSegment, Accelerate),      // len: 111m
+			(5050, 5062, WithinSegment, Roll),            // len: 12m
+			(5062, 5095, WithinSegment, Accelerate),      // len: 33m
+			(5095, 5109, WithinSegment, Roll),            // len: 14m
+			(5109, 5231, WithinSegment, Accelerate),      // len: 122m
+			(5231, 5250, WithinSegment, Roll),            // len: 19m
+			(5250, 5369, WithinSegment, Accelerate),      // len: 119m
+			(5369, 5618, UseCase2, Roll),                 // len: 249m
+			(5618, 5836, WithinSegment, Coast),           // len: 218m
+			(5836, 6120, WithinSegment, Brake),           // len: 284m
+			(6120, 6231, WithinSegment, Coast),           // len: 111m
+			(6231, 6520, OutsideSegment, Coast),          // len: 289m
+			(6520, 1e6, OutsideSegment, Accelerate));
 
 		[TestCase]
 		public void Class5_PCC123EcoRollEngineStop_CrestCoast1_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
index edbf53336df8718c56455d4d1e65f1e7611d09d9..256e38698eba6bb72805912a126df20243d9fd79 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
@@ -391,15 +391,30 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase]
 		public void Class5_PCC12_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,
-			(500, 3559, OutsideSegment, Accelerate),        // len: 3559m
+			(0, 3559, OutsideSegment, Accelerate),        // len: 3559m
 			(3559, 4563, WithinSegment, Accelerate),      // len: 1004m
-			(5146, 5342, WithinSegment, Accelerate),      // len: 196m
-			(5342, 5669, UseCase2, Coast),                // len: 327m
-			(5669, 5740, WithinSegment, Coast),           // len: 71m
-			(5740, 6113, WithinSegment, Brake),           // len: 373m
-			(6113, 6125, WithinSegment, Coast),           // len: 12m
-			(6125, 6398, OutsideSegment, Coast),          // len: 273m
-			(6398, 1e6, OutsideSegment, Accelerate));
+			(4563, 4582, WithinSegment, Roll),            // len: 19m
+			(4582, 4709, WithinSegment, Accelerate),      // len: 127m
+			(4709, 4723, WithinSegment, Roll),            // len: 14m
+			(4723, 4789, WithinSegment, Accelerate),      // len: 66m
+			(4789, 4800, WithinSegment, Roll),            // len: 11m
+			(4800, 4861, WithinSegment, Accelerate),      // len: 61m
+			(4861, 4870, WithinSegment, Roll),            // len: 9m
+			(4870, 4931, WithinSegment, Accelerate),      // len: 61m
+			(4931, 4940, WithinSegment, Roll),            // len: 9m
+			(4940, 5028, WithinSegment, Accelerate),      // len: 88m
+			(5028, 5040, WithinSegment, Roll),            // len: 12m
+			(5040, 5079, WithinSegment, Accelerate),      // len: 39m
+			(5079, 5093, WithinSegment, Roll),            // len: 14m
+			(5093, 5131, WithinSegment, Accelerate),      // len: 38m
+			(5131, 5147, WithinSegment, Roll),            // len: 16m
+			(5147, 5344, WithinSegment, Accelerate),      // len: 197m
+			(5344, 5671, UseCase2, Coast),                // len: 327m
+			(5671, 5730, WithinSegment, Coast),           // len: 59m
+			(5730, 6115, WithinSegment, Brake),           // len: 385m
+			(6115, 6400, OutsideSegment, Coast),          // len: 285m
+			(6400, 1e6, OutsideSegment, Accelerate));
+
 
 		[TestCase]
 		public void Class5_PCC12_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name,