diff --git a/include/tudat/math/interpolators/oneDimensionalInterpolator.h b/include/tudat/math/interpolators/oneDimensionalInterpolator.h
index d3d6a767e6..3d58e2e2cf 100644
--- a/include/tudat/math/interpolators/oneDimensionalInterpolator.h
+++ b/include/tudat/math/interpolators/oneDimensionalInterpolator.h
@@ -351,17 +351,15 @@ class OneDimensionalInterpolator : public Interpolator< IndependentVariableType,
         case binarySearch:
         {
             // Create binary search look up scheme.
-            lookUpScheme_ = std::shared_ptr< LookUpScheme< IndependentVariableType > >
-                    ( new BinarySearchLookupScheme< IndependentVariableType >
-                      ( independentValues_ ) );
+            lookUpScheme_ = std::make_shared< BinarySearchLookupScheme< IndependentVariableType > >
+                      ( independentValues_ );
             break;
         }
         case huntingAlgorithm:
         {
             // Create hunting scheme, which uses an intial guess from previous look-ups.
-            lookUpScheme_ = std::shared_ptr< LookUpScheme< IndependentVariableType > >
-                    ( new HuntingAlgorithmLookupScheme< IndependentVariableType >
-                      ( independentValues_ ) );
+            lookUpScheme_ = std::make_shared< HuntingAlgorithmLookupScheme< IndependentVariableType > >
+                      ( independentValues_ );
             break;
         }
         default:
diff --git a/tests/src/astro/propagators/unitTestHybridArcVariationalEquations.cpp b/tests/src/astro/propagators/unitTestHybridArcVariationalEquations.cpp
index 432d55d00b..9806bdf28b 100644
--- a/tests/src/astro/propagators/unitTestHybridArcVariationalEquations.cpp
+++ b/tests/src/astro/propagators/unitTestHybridArcVariationalEquations.cpp
@@ -100,15 +100,13 @@ executeHybridArcMarsAndOrbiterSensitivitySimulation(
     double radiationPressureCoefficient = 1.2;
     std::vector< std::string > occultingBodies;
     occultingBodies.push_back( "Earth" );
-    std::shared_ptr< RadiationPressureInterfaceSettings > orbiterRadiationPressureSettings =
-            std::make_shared< CannonBallRadiationPressureInterfaceSettings >(
-                    "Sun", referenceAreaRadiation, radiationPressureCoefficient, occultingBodies );
+    std::shared_ptr< RadiationPressureTargetModelSettings > orbiterRadiationPressureSettings =
+        cannonballRadiationPressureTargetModelSettings(
+            referenceAreaRadiation, radiationPressureCoefficient, occultingBodies );
 
     // Create and set radiation pressure settings
-    bodies.at( "Orbiter" )->setRadiationPressureInterface(
-            "Sun", createRadiationPressureInterface(
-                    orbiterRadiationPressureSettings, "Orbiter", bodies ) );
-
+    bodies.at( "Orbiter" )->setRadiationPressureTargetModel(
+        createRadiationPressureTargetModel( orbiterRadiationPressureSettings, "Orbiter", bodies ) );
 
 
     // Set accelerations between bodies that are to be taken into account.
@@ -141,7 +139,7 @@ executeHybridArcMarsAndOrbiterSensitivitySimulation(
     std::map< std::string, std::vector< std::shared_ptr< AccelerationSettings > > > accelerationsOfOrbiter;
     accelerationsOfOrbiter[ "Mars" ].push_back( std::make_shared< SphericalHarmonicAccelerationSettings >( 2, 2 ) );
     accelerationsOfOrbiter[ "Sun" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
-    accelerationsOfOrbiter[ "Sun" ].push_back( std::make_shared< AccelerationSettings >( cannon_ball_radiation_pressure ) );
+    accelerationsOfOrbiter[ "Sun" ].push_back( std::make_shared< AccelerationSettings >( radiation_pressure ) );
     accelerationsOfOrbiter[ "Jupiter" ].push_back( std::make_shared< AccelerationSettings >( point_mass_gravity ) );
     multiArcAccelerationMap[ "Orbiter" ] = accelerationsOfOrbiter;