diff --git a/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp b/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
index 63676181f9604a30725d32865a203e8c43cb32ad..920caa4990095d2832c4ff73a0267d2dbef1278d 100644
--- a/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
+++ b/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
@@ -326,7 +326,7 @@ BOOST_AUTO_TEST_CASE(CuboidVolumeBuilderTest_confinedVolumes) {
 
   // Set initial parameters for the particle track
   Vector3D startParams(0., 0., 0.), startMom(1. * units::_GeV, 0., 0.);
-  SingleCurvilinearTrackParameters<ChargedPolicy> sbtp(nullptr, startParams,
+  SingleCurvilinearTrackParameters<ChargedPolicy> sbtp(std::nullopt, startParams,
                                                        startMom, 1., 0.);
 
   // Launch and collect results
@@ -436,7 +436,7 @@ BOOST_AUTO_TEST_CASE(CuboidVolumeBuilderTest_confinedVolumes_edgecases) {
 
   // Set initial parameters for the particle track
   Vector3D startParams(0., 0., 0.), startMom(1. * units::_GeV, 0., 0.);
-  SingleCurvilinearTrackParameters<ChargedPolicy> sbtp(nullptr, startParams,
+  SingleCurvilinearTrackParameters<ChargedPolicy> sbtp(std::nullopt, startParams,
                                                        startMom, 1., 0.);
 
   // Launch and collect results
diff --git a/Tests/Core/Propagator/StepperTests.cpp b/Tests/Core/Propagator/StepperTests.cpp
index b11f1184dd5ec54a814d25f727b809b15f49c4cf..ae5efe4c867c20fe7548e08784fc3e08c0c70d6b 100644
--- a/Tests/Core/Propagator/StepperTests.cpp
+++ b/Tests/Core/Propagator/StepperTests.cpp
@@ -709,10 +709,9 @@ BOOST_AUTO_TEST_CASE(step_extension_trackercalomdt_test) {
 
   // Set initial parameters for the particle track
   Covariance cov = Covariance::Identity();
-  auto covPtr = std::make_unique<const Covariance>(cov);
   Vector3D startParams(0., 0., 0.), startMom(1._GeV, 0., 0.);
   SingleCurvilinearTrackParameters<ChargedPolicy> sbtp(
-      std::move(covPtr), startParams, startMom, 1., 0.);
+      cov, startParams, startMom, 1., 0.);
 
   // Set options for propagator
   DenseStepperPropagatorOptions<ActionList<StepCollector, MaterialInteractor>,