diff --git a/cpp/benchmarks/graph_simulation.cpp b/cpp/benchmarks/graph_simulation.cpp
index 9ecb156d85..595e0a5f57 100644
--- a/cpp/benchmarks/graph_simulation.cpp
+++ b/cpp/benchmarks/graph_simulation.cpp
@@ -169,8 +169,8 @@ BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::EulerIntegratorCore)->Name("Graph Si
 BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::RKIntegratorCore)->Name("Graph Simulation - adapt_rk");
 BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_cash_karp54>)
     ->Name("Graph Simulation - rk_ck54 (boost)");
-BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
-    ->Name("Graph Simulation - rk_dopri5 (boost)");
+// BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
+// ->Name("Graph Simulation - rk_dopri5 (boost)"); // TODO: reenable once boost bug is fixed
 BENCHMARK_TEMPLATE(graph_sim_secirvvs, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_fehlberg78>)
     ->Name("Graph Simulation - rkf78 (boost)");
 // run all benchmarks
diff --git a/cpp/benchmarks/integrator_step.config b/cpp/benchmarks/integrator_step.config
index e4a8d8b236..99aaa76922 100755
--- a/cpp/benchmarks/integrator_step.config
+++ b/cpp/benchmarks/integrator_step.config
@@ -11,7 +11,9 @@
                 6377.873644,
                 35.24915600,
                 30.02961100,
+                0.000000000,
                 182.1458650,
+                0.000000000,
                 66.15305900,
                 79.53062100,
                 3069.383604,
diff --git a/cpp/benchmarks/integrator_step.cpp b/cpp/benchmarks/integrator_step.cpp
index f57d868bed..edccd893fd 100644
--- a/cpp/benchmarks/integrator_step.cpp
+++ b/cpp/benchmarks/integrator_step.cpp
@@ -58,8 +58,8 @@ BENCHMARK_TEMPLATE(integrator_step, mio::RKIntegratorCore)->Name("Dummy 3/3");
 BENCHMARK_TEMPLATE(integrator_step, mio::RKIntegratorCore)->Name("simulate SecirModel adapt_rk");
 BENCHMARK_TEMPLATE(integrator_step, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_cash_karp54>)
     ->Name("simulate SecirModel boost rk_ck54");
-BENCHMARK_TEMPLATE(integrator_step, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
-    ->Name("simulate SecirModel boost rk_dopri5");
+// BENCHMARK_TEMPLATE(integrator_step, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
+// ->Name("simulate SecirModel boost rk_dopri5"); // TODO: reenable once boost bug is fixed
 BENCHMARK_TEMPLATE(integrator_step, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_fehlberg78>)
     ->Name("simulate SecirModel boost rkf78");
 // run all benchmarks
diff --git a/cpp/benchmarks/simulation.cpp b/cpp/benchmarks/simulation.cpp
index 3e8c0d6047..988a0df1b6 100644
--- a/cpp/benchmarks/simulation.cpp
+++ b/cpp/benchmarks/simulation.cpp
@@ -49,8 +49,8 @@ BENCHMARK_TEMPLATE(simulation, mio::RKIntegratorCore)->Name("Dummy 3/3");
 BENCHMARK_TEMPLATE(simulation, mio::RKIntegratorCore)->Name("simulate SecirModel adapt_rk");
 BENCHMARK_TEMPLATE(simulation, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_cash_karp54>)
     ->Name("simulate SecirModel boost rk_ck54");
-BENCHMARK_TEMPLATE(simulation, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
-    ->Name("simulate SecirModel boost rk_dopri5");
+// BENCHMARK_TEMPLATE(simulation, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>)
+//     ->Name("simulate SecirModel boost rk_dopri5"); // TODO: reenable once boost bug is fixed
 BENCHMARK_TEMPLATE(simulation, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_fehlberg78>)
     ->Name("simulate SecirModel boost rkf78");
 // run all benchmarks
diff --git a/cpp/memilio/math/adapt_rk.cpp b/cpp/memilio/math/adapt_rk.cpp
index 3255fc599f..88af7a25b3 100644
--- a/cpp/memilio/math/adapt_rk.cpp
+++ b/cpp/memilio/math/adapt_rk.cpp
@@ -18,6 +18,7 @@
 * limitations under the License.
 */
 #include "memilio/math/adapt_rk.h"
+#include "memilio/utils/logging.h"
 
 namespace mio
 {
@@ -73,11 +74,20 @@ Tableau::Tableau()
 bool RKIntegratorCore::step(const DerivFunction& f, Eigen::Ref<const Eigen::VectorXd> yt, double& t, double& dt,
                             Eigen::Ref<Eigen::VectorXd> ytp1) const
 {
+    assert(0 <= m_dt_min);
+    assert(m_dt_min <= m_dt_max);
+
+    if (dt < m_dt_min || dt > m_dt_max) {
+        mio::log_warning("IntegratorCore: Restricting given step size dt = {} to [{}, {}].", dt, m_dt_min, m_dt_max);
+    }
+
+    dt = std::min(dt, m_dt_max);
+
     double t_eval; // shifted time for evaluating yt
     double dt_new; // updated dt
 
-    bool converged              = false; // carry for convergence criterion
-    bool failed_step_size_adapt = false;
+    bool converged     = false; // carry for convergence criterion
+    bool dt_is_invalid = false;
 
     if (m_yt_eval.size() != yt.size()) {
         m_yt_eval.resize(yt.size());
@@ -86,7 +96,11 @@ bool RKIntegratorCore::step(const DerivFunction& f, Eigen::Ref<const Eigen::Vect
 
     m_yt_eval = yt;
 
-    while (!converged && !failed_step_size_adapt) {
+    while (!converged && !dt_is_invalid) {
+        if (dt < m_dt_min) {
+            dt_is_invalid = true;
+            dt            = m_dt_min;
+        }
         // compute first column of kt, i.e. kt_0 for each y in yt_eval
         f(m_yt_eval, t, m_kt_values.col(0));
 
@@ -113,7 +127,7 @@ bool RKIntegratorCore::step(const DerivFunction& f, Eigen::Ref<const Eigen::Vect
 
         converged = (m_error_estimate <= m_eps).all(); // convergence criterion
 
-        if (converged) {
+        if (converged || dt_is_invalid) {
             // if sufficiently exact, return ytp1, which currently contains the lower order approximation
             // (higher order is not always higher accuracy)
             t += dt; // this is the t where ytp1 belongs to
@@ -128,14 +142,12 @@ bool RKIntegratorCore::step(const DerivFunction& f, Eigen::Ref<const Eigen::Vect
         // and to avoid dt_new -> dt for step decreases when |error_estimate - eps| -> 0
         dt_new *= 0.9;
         // check if updated dt stays within desired bounds and update dt for next step
-        if (m_dt_min < dt_new) {
-            dt = std::min(dt_new, m_dt_max);
-        }
-        else {
-            failed_step_size_adapt = true;
-        }
+        dt = std::min(dt_new, m_dt_max);
     }
-    return !failed_step_size_adapt;
+    dt = std::max(dt, m_dt_min);
+    // return 'converged' in favor of '!dt_is_invalid', as these values only differ if step sizing failed,
+    // but the step with size dt_min was accepted.
+    return converged;
 }
 
 } // namespace mio
diff --git a/cpp/memilio/math/integrator.cpp b/cpp/memilio/math/integrator.cpp
index 58f623bcf6..ad5388974e 100644
--- a/cpp/memilio/math/integrator.cpp
+++ b/cpp/memilio/math/integrator.cpp
@@ -58,7 +58,7 @@ Eigen::Ref<Eigen::VectorXd> OdeIntegrator::advance(const DerivFunction& f, const
     }
 
     if (!step_okay) {
-        log_warning("Adaptive step sizing failed.");
+        log_warning("Adaptive step sizing failed. Forcing an integration step of size dt_min.");
     }
     else if (std::abs((tmax - t) / (tmax - t0)) > 1e-14) {
         log_warning("Last time step too small. Could not reach tmax exactly.");
diff --git a/cpp/memilio/math/integrator.h b/cpp/memilio/math/integrator.h
index 37a23ae1ad..e1ca89a849 100644
--- a/cpp/memilio/math/integrator.h
+++ b/cpp/memilio/math/integrator.h
@@ -22,11 +22,8 @@
 
 #include "memilio/utils/time_series.h"
 
-#include "memilio/math/eigen.h"
 #include <memory>
-#include <vector>
 #include <functional>
-#include <algorithm>
 
 namespace mio
 {
@@ -43,13 +40,27 @@ class IntegratorCore
     virtual ~IntegratorCore(){};
 
     /**
-     * @brief Step of the integration with possible adaptive with
+     * @brief Make a single integration step.
      *
-     * @param[in] f Right hand side of ODE
-     * @param[in] yt value of y at t, y(t)
-     * @param[in,out] t current time step h=dt
-     * @param[in,out] dt current time step h=dt
-     * @param[out] ytp1 approximated value y(t+1)
+     * The behaviour of this method changes when the integration scheme has adaptive step sizing. 
+     * These changes are noted in the parentheses (...) below.
+     * Adaptive integrators must have bounds dt_min and dt_max for dt.
+     * The adaptive step sizing is considered to be successful, if a step of at least size dt_min sufficed tolerances.
+     * Tolerances are defined in each implementation, usually using a criterion with absolute and relative tolerances.
+     * Even if the step sizing failed, the integrator will make a step of at least size dt_min.
+     *
+     * @param[in] f Right hand side of the ODE. May be called multiple times with different arguments.
+     * @param[in] yt The known value of y at time t.
+     * @param[in,out] t The current time. It will be increased by dt.
+     *     (If adaptive, the increment is instead within [dt_min, dt].)
+     * @param[in,out] dt The current step size h=dt. Will not be changed.
+     *     (If adaptive, the given dt is used as the maximum step size, and must be within [dt_min, dt_max].
+     *      During integration, dt is adjusted in [dt_min, dt_max] to have an optimal size for the next step.)
+     * @param[out] ytp1 Set to the approximated value of y at time t + dt.
+     *     (If adaptive, this time may be smaller, but it is at least t + dt_min, at most t + dt_max.
+     *      Note that the increment on t may be different from the returned value of dt.)
+     * @return Always true for nonadaptive methods.
+     *     (If adaptive, returns whether the adaptive step sizing was successful.)
      */
     virtual bool step(const DerivFunction& f, Eigen::Ref<const Eigen::VectorXd> yt, double& t, double& dt,
                       Eigen::Ref<Eigen::VectorXd> ytp1) const = 0;
diff --git a/cpp/memilio/math/stepper_wrapper.h b/cpp/memilio/math/stepper_wrapper.h
index 5d5e03f083..d0517b3df7 100644
--- a/cpp/memilio/math/stepper_wrapper.h
+++ b/cpp/memilio/math/stepper_wrapper.h
@@ -22,6 +22,7 @@
 
 #include "memilio/utils/compiler_diagnostics.h"
 #include "memilio/math/integrator.h"
+#include "memilio/utils/logging.h"
 
 GCC_CLANG_DIAGNOSTIC(push)
 GCC_CLANG_DIAGNOSTIC(ignored "-Wshadow")
@@ -32,7 +33,7 @@ MSVC_WARNING_DISABLE_PUSH(4127)
 #include "boost/numeric/odeint/stepper/runge_kutta4.hpp"
 #include "boost/numeric/odeint/stepper/runge_kutta_fehlberg78.hpp"
 #include "boost/numeric/odeint/stepper/runge_kutta_cash_karp54.hpp"
-#include "boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp"
+// #include "boost/numeric/odeint/stepper/runge_kutta_dopri5.hpp" // TODO: reenable once boost bug is fixed
 MSVC_WARNING_POP()
 GCC_CLANG_DIAGNOSTIC(pop)
 
@@ -50,6 +51,12 @@ template <template <class State = Eigen::VectorXd, class Value = double, class D
           class ControlledStepper>
 class ControlledStepperWrapper : public mio::IntegratorCore
 {
+    using Stepper                         = boost::numeric::odeint::controlled_runge_kutta<ControlledStepper<>>;
+    static constexpr bool is_fsal_stepper = std::is_same_v<typename Stepper::stepper_type::stepper_category,
+                                                           boost::numeric::odeint::explicit_error_stepper_fsal_tag>;
+    static_assert(!is_fsal_stepper,
+                  "FSAL steppers cannot be used until https://github.com/boostorg/odeint/issues/72 is resolved.");
+
 public:
     /**
      * @brief Set up the integrator
@@ -70,32 +77,67 @@ class ControlledStepperWrapper : public mio::IntegratorCore
     }
 
     /**
-    * @brief Make a single integration step of a system of ODEs and adapt step width
-    * @param[in] yt value of y at t, y(t)
-    * @param[in,out] t current time step h=dt
-    * @param[in,out] dt current time step h=dt
-    * @param[out] ytp1 approximated value y(t+1)
+    * @brief Make a single integration step on a system of ODEs and adapt the step size dt.
+
+    * @param[in] yt Value of y at t_{k}, y(t_{k}).
+    * @param[in,out] t Current time step t_{k} for some k. Will be set to t_{k+1} in [t_{k} + dt_min, t_{k} + dt].
+    * @param[in,out] dt Current time step size h=dt. Overwritten by an estimated optimal step size for the next step.
+    * @param[out] ytp1 The approximated value of y(t_{k+1}).
     */
     bool step(const mio::DerivFunction& f, Eigen::Ref<Eigen::VectorXd const> yt, double& t, double& dt,
               Eigen::Ref<Eigen::VectorXd> ytp1) const override
     {
-        // copy y(t) to dydt, to retrieve the VectorXd from the Ref
-        dydt               = yt;
-        const double t_old = t; // t is updated by try_step on a successfull step
-        do {
-            // we use the scheme try_step(sys, inout, t, dt) with sys=f, inout=y(t) for
-            // in-place computation. This is similiar to do_step, but it can update t and dt
-            m_stepper.try_step(
-                // reorder arguments of the DerivFunction f for the stepper
-                [&](const Eigen::VectorXd& x, Eigen::VectorXd& dxds, double s) {
-                    dxds.resizeLike(x); // try_step calls sys with a vector of size 0 for some reason
-                    f(x, s, dxds);
-                },
-                dydt, t, dt);
-            // stop on a successfull step or a failed step size adaption (w.r.t. the minimal step size)
-        } while (t == t_old && dt > m_dt_min);
-        ytp1 = dydt; // output new y(t)
-        return dt > m_dt_min;
+        using boost::numeric::odeint::fail;
+        assert(0 <= m_dt_min);
+        assert(m_dt_min <= m_dt_max);
+
+        if (dt < m_dt_min || dt > m_dt_max) {
+            mio::log_warning("IntegratorCore: Restricting given step size dt = {} to [{}, {}].", dt, m_dt_min,
+                             m_dt_max);
+        }
+        // set initial values for exit conditions
+        auto step_result = fail;
+        bool is_dt_valid = true;
+        // copy vectors from the references, since the stepper cannot (trivially) handle Eigen::Ref
+        m_ytp1 = ytp1;
+        m_yt   = yt;
+        // make a integration step, adapting dt to a possibly larger value on success,
+        // or a strictly smaller value on fail.
+        // stop only on a successful step or a failed step size adaption (w.r.t. the minimal step size m_dt_min)
+        while (step_result == fail && is_dt_valid) {
+            if (dt < m_dt_min) {
+                is_dt_valid = false;
+                dt          = m_dt_min;
+            }
+            // we use the scheme try_step(sys, in, t, out, dt) with sys=f, in=y(t_{k}), out=y(t_{k+1}).
+            // this is similiar to do_step, but it can adapt the step size dt. If successful, it also updates t.
+
+            if constexpr (!is_fsal_stepper) { // prevent compile time errors with fsal steppers
+                step_result = m_stepper.try_step(
+                    // reorder arguments of the DerivFunction f for the stepper
+                    [&](const Eigen::VectorXd& x, Eigen::VectorXd& dxds, double s) {
+                        dxds.resizeLike(x); // boost resizers cannot resize Eigen::Vector, hence we need to do that here
+                        f(x, s, dxds);
+                    },
+                    m_yt, t, m_ytp1, dt);
+            }
+        }
+        // output the new value by copying it back to the reference
+        ytp1 = m_ytp1;
+        // bound dt from below
+        // the last adaptive step (successful or not) may have calculated a new step size smaller than m_dt_min
+
+        dt = std::max(dt, m_dt_min);
+        // check whether the last step failed (which means that m_dt_min was still too large to suffice tolerances)
+        if (step_result == fail) {
+            // adaptive stepping failed, but we still return the result of the last attempt
+            t += m_dt_min;
+            return false;
+        }
+        else {
+            // successfully made an integration step
+            return true;
+        }
     }
 
     /// @param tol the required absolute tolerance for comparison of the iterative approximation
@@ -126,21 +168,18 @@ class ControlledStepperWrapper : public mio::IntegratorCore
     }
 
 private:
-    boost::numeric::odeint::controlled_runge_kutta<ControlledStepper<>> create_stepper()
+    /// @brief (Re)initialize the internal stepper.
+    Stepper create_stepper()
     {
         // for more options see: boost/boost/numeric/odeint/stepper/controlled_runge_kutta.hpp
-        return boost::numeric::odeint::controlled_runge_kutta<ControlledStepper<>>(
-            boost::numeric::odeint::default_error_checker<typename ControlledStepper<>::value_type,
-                                                          typename ControlledStepper<>::algebra_type,
-                                                          typename ControlledStepper<>::operations_type>(m_abs_tol,
-                                                                                                         m_rel_tol),
-            boost::numeric::odeint::default_step_adjuster<typename ControlledStepper<>::value_type,
-                                                          typename ControlledStepper<>::time_type>(m_dt_max));
+        return Stepper(typename Stepper::error_checker_type(m_abs_tol, m_rel_tol),
+                       typename Stepper::step_adjuster_type(m_dt_max));
     }
 
-    double m_abs_tol, m_rel_tol, m_dt_min, m_dt_max; // integrator parameters
-    mutable Eigen::VectorXd dydt;
-    mutable boost::numeric::odeint::controlled_runge_kutta<ControlledStepper<>> m_stepper;
+    double m_abs_tol, m_rel_tol; ///< Absolute and relative tolerances for integration.
+    double m_dt_min, m_dt_max; ///< Lower and upper bound to the step size dt.
+    mutable Eigen::VectorXd m_ytp1, m_yt; ///< Temporary storage to avoid allocations in step function.
+    mutable Stepper m_stepper; ///< A stepper instance used for integration.
 };
 
 } // namespace mio
diff --git a/cpp/tests/data/secihurd-compare-cashkarp.csv b/cpp/tests/data/secihurd-compare-cashkarp.csv
index 86c238b5e3..bed80794f0 100644
--- a/cpp/tests/data/secihurd-compare-cashkarp.csv
+++ b/cpp/tests/data/secihurd-compare-cashkarp.csv
@@ -1,54 +1,53 @@
- # t S E C I H U R D
-0.00000000000000  9760.00000000000000 100.00000000000000 50.00000000000000 0.00000000000000 50.00000000000000 0.00000000000000 20.00000000000000 10.00000000000000 10.00000000000000 0.00000000000000
-0.10000000000000  9757.42416799591774 99.45942737057148 50.60117953460856 0.00000000000000 51.41459534037427 0.00000000000000 19.96451694367821 9.91235721061906 11.18168764569956 0.04206795853284
-0.55000000000000  9745.36796156551827 97.66667068776199 52.80317079869251 0.00000000000000 57.77716750828912 0.00000000000000 19.86873991622822 9.53203585185989 16.75736344521052 0.22689022644118
-1.55000000000000  9716.32573467588008 96.45871624386538 55.82004175993373 0.00000000000000 71.40850281102291 0.00000000000000 20.00435155002245 8.76823520359937 30.60129355025187 0.61312420542556
-2.55000000000000  9684.84392106642554 97.65645154463921 57.70082019979476 0.00000000000000 83.85232912913928 0.00000000000000 20.55361273314174 8.11347803504941 46.30998287611538 0.96940441569422
-3.55000000000000  9651.35952069698214 100.24618804447634 59.33612849760997 0.00000000000000 95.03957688394573 0.00000000000000 21.43405725147031 7.56254296082426 63.72175257837041 1.30023308631996
-4.55000000000000  9616.07438789925436 103.68451583453781 61.08585556228109 0.00000000000000 105.15605137272601 0.00000000000000 22.57421092178311 7.10899312946900 82.70612077290434 1.60986450704326
-5.55000000000000  9579.07636266217014 107.66994956713232 63.07006406237672 0.00000000000000 114.45025822873436 0.00000000000000 23.91718883376037 6.74566503224302 103.16824769559898 1.90226391798261
-6.55000000000000  9540.39902488573716 112.02760951218818 65.30591995094085 0.00000000000000 123.15627538646308 0.00000000000000 25.41980172035565 6.46511601177571 125.04516596275778 2.18108656978164
-7.55000000000000  9500.05132768897602 116.65024851764196 67.77067391178257 0.00000000000000 131.46829124321573 0.00000000000000 27.05020239083490 6.25996879869459 148.29961385053966 2.44967359831460
-8.55000000000000  9458.03243315019972 121.46758330700887 70.42951739027194 0.00000000000000 139.53703717782483 0.00000000000000 28.78535182161942 6.12314918871636 172.91386780228237 2.71106016207818
-9.55000000000000  9414.33926263057583 126.43000010129326 73.24704430461132 0.00000000000000 147.47446594076868 0.00000000000000 30.60878289698674 6.04803352860099 198.88441895317894 2.96799164398624
-10.55000000000000  9368.97044587585697 131.49967050116439 76.19128008042999 0.00000000000000 155.36067397621457 0.00000000000000 32.50878821045587 6.02852719829158 226.21766960414632 3.22294455344091
-11.55000000000000  9321.92791613932786 136.64609505227898 79.23453729639604 0.00000000000000 163.25062784014847 0.00000000000000 34.47701602064753 6.05909352992499 254.92656448626579 3.47814963501048
-12.55000000000000  9273.21348586526801 141.84714004035681 82.35362158801314 0.00000000000000 171.17996868709139 0.00000000000000 36.50741162851529 6.13474894238180 285.02800781182117 3.73561543655228
-13.55000000000000  9222.83072520511269 147.08499311889216 85.52972379516707 0.00000000000000 179.16997286996340 0.00000000000000 38.59544039087945 6.25103638659114 316.54095705666384 3.99715117673056
-14.55000000000000  9170.78729518242653 152.34310219775560 88.74723709988766 0.00000000000000 187.23141677467635 0.00000000000000 40.73753337129430 6.40398612926937 349.48504104859160 4.26438819609903
-15.55000000000000  9117.09514977204708 157.60566654411710 91.99273353836114 0.00000000000000 195.36734552877184 0.00000000000000 42.93069586145597 6.59007023995204 383.87953891533562 4.53879959995935
-16.55000000000000  9061.77071828493536 162.85727844150250 95.25424151373720 0.00000000000000 203.57504405572863 0.00000000000000 45.17223160560138 6.80615498211071 419.74261319425210 4.82171792213237
-17.55000000000000  9004.83509094406691 168.08265824006412 98.52073253000115 0.00000000000000 211.84744161399504 0.00000000000000 47.45954913263336 7.04945377842564 457.09072297889827 5.11435078191700
-18.55000000000000  8946.31420931169851 173.26645631828353 101.78175408704665 0.00000000000000 220.17411261803267 0.00000000000000 49.79002631563454 7.31748237370960 495.93816437978734 5.41779459580659
-19.55000000000000  8886.23906245831677 178.39310325586874 105.02716505237703 0.00000000000000 228.54198881812565 0.00000000000000 52.16091615173934 7.60801711067648 536.29670069471490 5.73304645818114
-20.55000000000000  8824.64588863938661 183.44669550688150 108.24694324574807 0.00000000000000 236.93586448656660 0.00000000000000 54.56928163206146 7.91905676070341 578.17525539546637 6.06101433318483
-21.55000000000000  8761.57638096777919 188.41090837361315 111.43104438250990 0.00000000000000 245.33875281608772 0.00000000000000 57.01195104267610 8.24878804188740 621.57964866378370 6.40252571166046
-22.55000000000000  8697.07789422693168 193.26893143630755 114.56929817778354 0.00000000000000 253.73213531265415 0.00000000000000 59.48548751844529 8.59555475961610 666.51236368014816 6.75833488811198
-23.55000000000000  8631.20364860874543 198.00342406313518 117.65133215306368 0.00000000000000 262.09613448822296 0.00000000000000 61.98616845392615 8.95783038530840 712.97233284041909 7.12912900717919
-24.55000000000000  8564.01292481251039 202.59649041920227 120.66651707515986 0.00000000000000 270.40963217430317 0.00000000000000 64.50997166579346 9.33419382234254 760.95473701092828 7.51553301975936
-25.55000000000000  8495.57124363814364 207.02967466703703 123.60393038180868 0.00000000000000 278.65035025474560 0.00000000000000 67.05256614450234 9.72330807737162 810.45081315883749 7.91811367755223
-26.55000000000000  8425.95052198530357 211.28397791211367 126.45233567525413 0.00000000000000 286.79490682405799 0.00000000000000 69.60930593170494 10.12390154836528 861.44766744051594 8.33738268268472
-27.55000000000000  8355.22919607359290 215.33989896827666 129.20017757788136 0.00000000000000 294.81885819195935 0.00000000000000 72.17522618608125 10.53475164962043 913.92809225556914 8.77379909701879
-28.55000000000000  8283.49230177971913 219.17750124604655 131.83559206800314 0.00000000000000 302.69673539851175 0.00000000000000 74.74504090387578 10.95467051300846 967.87038698653612 9.22777110429916
-29.55000000000000  8217.07649085688172 216.79060651581622 134.09738293812762 0.00000000000000 310.39294808338190 0.00000000000000 77.31314207612382 11.38249252999777 1023.24727979187423 9.69965720779790
-30.55000000000000  8192.03049211592224 179.77022021897349 129.77520030904213 0.00000000000000 316.70303304135280 0.00000000000000 79.86109182506537 11.81698366714354 1079.85321251273376 10.18976630976700
-31.55000000000000  8171.07899719241959 149.48894556972473 118.72195312164486 0.00000000000000 318.54333727023050 0.00000000000000 82.29297413511642 12.25577358860602 1136.91968139684036 10.69833772541728
-32.55000000000000  8151.53826162753739 126.11615740683251 105.54115507369579 0.00000000000000 314.90425550909839 0.00000000000000 84.45086648642848 12.69349870510316 1193.53035320852814 11.22545198277533
-33.55000000000000  8133.57499348045530 107.66044917662531 92.48570266396274 0.00000000000000 306.30900868318906 0.00000000000000 86.18900372631853 13.12167274347551 1248.88827539236945 11.77089413360337
-34.55000000000000  8117.17207770030836 92.81940370893263 80.53147230776507 0.00000000000000 293.83553237469090 0.00000000000000 87.40437404025785 13.52985422289284 1302.37324126889644 12.33404437625530
-35.55000000000000  8102.24077724088875 80.69981847201048 70.00883737807064 0.00000000000000 278.64458742432095 0.00000000000000 88.04174818817539 13.90704988491638 1353.54335606426116 12.91382534735537
-36.55000000000000  8088.68827611874713 70.65077812414283 60.93316351074521 0.00000000000000 261.77542960806989 0.00000000000000 88.08771218835453 14.24289803395370 1402.11303745675673 13.50870495922912
-37.55000000000000  8076.41957851589723 62.19841128190283 53.17796619535603 0.00000000000000 244.07429157452827 0.00000000000000 87.56107569826058 14.52849437818516 1447.92344051961868 14.11674183625039
-38.55000000000000  8065.33279320790461 55.00175920976407 46.56871163788690 0.00000000000000 226.18793514309226 0.00000000000000 86.50310907241386 14.75686720619586 1490.91316644653625 14.73565807620548
-39.55000000000000  8055.32634567279183 48.81098124576695 40.92851050962727 0.00000000000000 208.58622507406244 0.00000000000000 84.96910112829057 14.92316534458045 1531.09274526988111 15.36292575499838
-40.55000000000000  8046.30286561931462 43.43961991310204 36.09753008915499 0.00000000000000 191.59396627981957 0.00000000000000 83.02169011977837 15.02463621339982 1568.52383509586434 15.99585666956491
-41.55000000000000  8038.17106491530649 38.74600989640295 31.93924668995700 0.00000000000000 175.42265730087044 0.00000000000000 80.72591775910560 15.06046509118520 1603.30295035447079 16.63168799270071
-42.55000000000000  8030.84649170099965 34.62062711978811 28.34050800683147 0.00000000000000 160.19832659367574 0.00000000000000 78.14575719950122 15.03153320159511 1635.54909693315221 17.26765924445674
-43.55000000000000  8024.25166515937690 30.97735672570390 25.20901410046119 0.00000000000000 145.98434481818663 0.00000000000000 75.34181612361452 14.94013772480408 1665.39458723804023 17.90107810981224
-44.55000000000000  8018.31587825798306 27.74738501222346 22.47001253406636 0.00000000000000 132.79936086900747 0.00000000000000 72.36993342357042 14.78970397238161 1692.97835175701357 18.52937417375431
-45.55000000000000  8012.97483184529119 24.87487282870829 20.06304275678292 0.00000000000000 120.63100847568948 0.00000000000000 69.28043064526351 14.58450959236360 1718.44116316157033 19.15014069433063
-46.55000000000000  8008.17019260401321 22.31385404299293 17.93906976599187 0.00000000000000 109.44615871842309 0.00000000000000 66.11782720977388 14.32943280128611 1741.92229965845149 19.76116519906736
-47.55000000000000  8003.84912674142015 20.02598640653189 16.05810254533900 0.00000000000000 99.19845435624988 0.00000000000000 62.92087250805222 14.02973094193660 1763.55727643071191 20.36045006975793
-48.55000000000000  7999.96383797851013 17.97890190382624 14.38728051993976 0.00000000000000 89.83375787394210 0.00000000000000 59.72278508518860 13.69085171374372 1783.47636046696039 20.94622445788752
-49.55000000000000  7996.47112500613366 16.14498288893416 12.89936686867238 0.00000000000000 81.29402691159787 0.00000000000000 56.55161881111715 13.31827680715262 1801.80365379356886 21.51694891282138
-50.00000000000000  7995.01694195256641 15.38280554607734 12.28327007645840 0.00000000000000 77.70450161691357 0.00000000000000 55.13975324482613 13.14106695081606 1809.56315290510111 21.76850770723936
+#Time                 S                     E                     C                     C+                    I                     I+                    H                     U                     R                     D                    
+    0.000000000000000  9760.000000000000000    99.999999999999986    49.999999999999993     0.000000000000000    49.999999999999993     0.000000000000000    20.000000000000000    10.000000000000000    10.000000000000000     0.000000000000000
+    0.300000000000000  9752.155886145610566    98.541272877336979    51.672558672264280     0.000000000000000    54.247535786445241     0.000000000000000    19.909182438064633     9.740488948557942    13.607970182477970     0.125104949241436
+    1.300000000000000  9723.839990543248859    96.480113388731652    55.225527107790370     0.000000000000000    68.098963101902072     0.000000000000000    19.928344335892621     8.948791559858579    26.958715565945390     0.519554396629057
+    2.300000000000000  9692.913861115173859    97.197401197795017    57.276171114756963     0.000000000000000    80.863039815749161     0.000000000000000    20.382156731868250     8.267205678648322    42.217271868014890     0.882892477990650
+    3.300000000000000  9659.904731598424405    99.503334704816638    58.925023197914825     0.000000000000000    92.352405776000637     0.000000000000000    21.187051073724405     7.690879219739353    59.216899784158564     1.219674645218033
+    4.300000000000000  9625.058439797054234   102.764654213151744    60.628669393099031     0.000000000000000   102.713823160046672     0.000000000000000    22.268184831910236     7.213634595258916    77.818372168304506     1.534221841173224
+    5.300000000000000  9588.484036156862203   106.633341833626517    62.550091028089092     0.000000000000000   112.190398154690286     0.000000000000000    23.565005286869379     6.828444656509435    97.918108601243915     1.830574282108008
+    6.300000000000000  9550.225057213752734   110.909964728558293    64.724266406846795     0.000000000000000   121.023535858815180     0.000000000000000    25.031093721294617     6.527899880120886   119.445716507590163     2.112465683018365
+    7.300000000000000  9510.294813672935561   115.474035322168348    67.134867605241254     0.000000000000000   129.418269439237605     0.000000000000000    26.632010128363945     6.304580399411706   142.358108085274921     2.383315347365906
+    8.300000000000001  9468.694006191206427   120.247962337171629    69.748590554556827     0.000000000000000   137.535935951000141     0.000000000000000    28.342738580285413     6.151319253619405   166.633213472511954     2.646233659645673
+    9.300000000000001  9425.419646248359641   125.178008498670152    72.529607641671120     0.000000000000000   145.497561632855934     0.000000000000000    30.145355807544227     6.061370455402924   192.264413093778387     2.904036621714658
+   10.300000000000001  9380.469684395133299   130.223978934187130    75.444929086182768     0.000000000000000   153.390546618919558     0.000000000000000    32.027111126070352     6.028502779018577   219.255981214403505     3.159265846083724
+   11.300000000000001  9333.845334345713127   135.353640395413123    78.465792498928948     0.000000000000000   161.275558999785034     0.000000000000000    33.978925434905094     6.047039437913672   247.619497584155226     3.414211303184471
+   12.300000000000001  9285.548696969528464   140.542763980306603    81.567837116923229     0.000000000000000   169.192573959391609     0.000000000000000    35.994252653881844     6.111860397637779   277.371080018664259     3.670934903665394
+   13.300000000000001  9235.582463269089203   145.773005230779006    84.731253008624378     0.000000000000000   177.166047432234393     0.000000000000000    38.068237740868099     6.218380286685406   308.529319408362312     3.931293623354800
+   14.300000000000001  9183.953249425680042   151.027553786051840    87.939743294514045     0.000000000000000   185.209083630649957     0.000000000000000    40.197112462930797     6.362511650262913   341.113784393975720     4.196961355931265
+   15.300000000000001  9130.671919212996727   156.290458920315984    91.179413054378273     0.000000000000000   193.326449107900828     0.000000000000000    42.377768258815209     6.540620544401484   375.143921870250665     4.469449030937880
+   16.300000000000001  9075.753765893334275   161.546242571323234    94.437981679116888     0.000000000000000   201.516718264051406     0.000000000000000    44.607455146415930     6.749479150555879   410.638234515771387     4.750122779428718
+   17.300000000000001  9019.218696835283481   166.779613847701484    97.704224169842234     0.000000000000000   209.773801970529803     0.000000000000000    46.883570090524195     6.986218411031068   447.613654585483005     5.040220089602293
+   18.300000000000001  8961.091422612662427   171.975256274723762   100.967572240354244     0.000000000000000   218.088036942605214     0.000000000000000    49.203508828884779     7.248282533757932   486.085056571335997     5.340863995673498
+   19.300000000000001  8901.401651715608750   177.117667305742344   104.217827358117006     0.000000000000000   226.446961313716201     0.000000000000000    51.564562646706463     7.533386433214275   526.064867823145732     5.653075403747222
+   20.300000000000001  8840.184290942279404   182.191036039708621   107.444952546793331     0.000000000000000   234.835865335644996     0.000000000000000    53.963846901639023     7.839476650214121   567.562747892008019     5.977783691710265
+   21.300000000000001  8777.479650287790719   187.179149936307908   110.638920044394609     0.000000000000000   243.238180513336999     0.000000000000000    56.398251879085038     8.164695948088161   610.585315655717409     6.315835735277156
+   22.300000000000001  8713.333649814710952   192.065324936968835   113.789599162980721     0.000000000000000   251.635752529281831     0.000000000000000    58.864409254634765     8.507351561314348   655.135909224473721     6.668003515633727
+   23.300000000000001  8647.798024629471911   196.832356068901674   116.886673852298230     0.000000000000000   260.009030756149286     0.000000000000000    61.358669375252568     8.865886936373037   701.214367921564872     7.034990459985188
+   24.300000000000001  8580.930522735121485   201.462487556127172   119.919583153495864     0.000000000000000   268.337198409433938     0.000000000000000    63.877085968444803     9.238856726583368   748.816828793060949     7.417436657729310
+   25.300000000000001  8512.795089213381289   205.937402853636030   122.877480365387882     0.000000000000000   276.598261332429900     0.000000000000000    66.415405907625910     9.624904764189679   797.935532479363019     7.815923083982312
+   26.300000000000001  8443.462028943209589   210.238235977091279   125.749208627082425     0.000000000000000   284.769109237194812     0.000000000000000    68.969062414057248    10.022744721006015   848.558635130189373     8.230974950164121
+   27.300000000000001  8373.008138930676068   214.345606101522179   128.523291948423491     0.000000000000000   292.825560378190517     0.000000000000000    71.533170639615747    10.431143174502028   900.670024537845279     8.663064289219793
+   28.300000000000001  8301.516800356172098   218.239677700626828   131.187941631588444     0.000000000000000   300.742398700752119     0.000000000000000    74.102525005148138    10.848904813129426   954.249139921161941     9.112611871417236
+   29.300000000000001  8230.161554724474627   220.875390722258089   133.672401392659935     0.000000000000000   308.493411187611969     0.000000000000000    76.671598004274173    11.274859538687029  1009.270795894128241     9.579988535901370
+   30.300000000000001  8196.943390485797863   189.261743518131254   131.742536046082478     0.000000000000000   315.430867662354899     0.000000000000000    79.229182848450563    11.707822356524629  1065.618941214363304    10.065515868290770
+   31.300000000000001  8175.698807113170915   156.688333493213207   121.926378996313559     0.000000000000000   318.606817540161103     0.000000000000000    81.703925210397571    12.145894840956471  1122.660387454528973    10.569455351253936
+   32.299999999999997  8155.765501719781241   131.721594856643122   109.031834785170560     0.000000000000000   316.380545364982424     0.000000000000000    83.946597496283530    12.584579586779832  1179.477406472171424    11.091939718184218
+   33.299999999999997  8137.388667274309228   112.116605257065743    95.821101714917077     0.000000000000000   308.986673471642291     0.000000000000000    85.804205396297746    13.016126641949597  1235.233778751658747    11.632841492156212
+   34.299999999999997  8120.586209821814919    96.422218673606721    83.531765007767504     0.000000000000000   297.414468343653652     0.000000000000000    87.161511588556493    13.430478891658890  1289.261695376050966    12.191652296887199
+   35.299999999999997  8105.280727643927094    83.656526488303371    72.624940307987600     0.000000000000000   282.828383137664105     0.000000000000000    87.951122848817448    13.816671211924662  1341.074213639785512    12.767414721587306
+   36.299999999999997  8091.377247104319395    73.114835260363861    63.178787132779561     0.000000000000000   266.309256396966589     0.000000000000000    88.149529511994629    14.164091558576576  1390.347541430564206    13.358711604432512
+   37.299999999999997  8078.783346994962812    64.279852275513022    55.093124458565910     0.000000000000000   248.755989823833318     0.000000000000000    87.768049850235457    14.463402879607536  1436.892531986188487    13.963701731091117
+   38.299999999999997  8067.398137246815168    56.780273559873933    48.200458470862202     0.000000000000000   230.866045471823071     0.000000000000000    86.842925134316815    14.707105279766946  1480.624868053259661    14.580186783280196
+   39.299999999999997  8057.119499985875336    50.345361870964744    42.322045461211545     0.000000000000000   213.152733918248316     0.000000000000000    85.426463651822786    14.889792035625444  1521.538407754489526    15.205695321760498
+   40.299999999999997  8047.848733846900359    44.774035584061529    37.292675421600599     0.000000000000000   195.975764787115850     0.000000000000000    83.579900947884525    15.008175604383274  1559.683141354503732    15.837572453549443
+   41.299999999999997  8039.492857369585181    39.914234302048165    32.969563118918259     0.000000000000000   179.573515332390770     0.000000000000000    81.368022239593046    15.060957362013285  1595.147783219901157    16.473067055549627
+   42.299999999999997  8031.965599969127652    35.648932608289080    29.233609267003906     0.000000000000000   164.092061018204163     0.000000000000000    78.855332169888541    15.048602455665733  1628.046451212711872    17.109411299109222
+   43.299999999999997  8025.187666130628713    31.886522028872157    25.987344149814902     0.000000000000000   149.609318176609435     0.000000000000000    76.103477780766667    14.973066573767676  1658.508715653898435    17.743889505640869
+   44.299999999999997  8019.086606410563036    28.554106512218020    23.151726563006413     0.000000000000000   136.154206618591303     0.000000000000000    73.169635270571177    14.837508020149773  1686.672315554497800    18.373895050402346
+   45.299999999999997  8013.596485056506026    25.592768842678009    20.662831307797980     0.000000000000000   123.721392587067726     0.000000000000000    70.105609574663319    14.646007434006215  1712.677929997465981    18.996975199817079
+   46.299999999999997  8008.657451875043080    22.954187943517685    18.468866043447658     0.000000000000000   112.282374454178054     0.000000000000000    66.957443410177959    14.403308996389487  1736.665502753758801    19.610864523490751
+   47.299999999999997  8004.215278903444414    20.598193284053117    16.527661680731402     0.000000000000000   101.793665942622681     0.000000000000000    63.765377930216459    14.114590735933344  1758.771723554988057    20.213507968013111
+   48.299999999999997  8000.220895428567928    18.490976526213295    14.804640993883535     0.000000000000000    92.202738535692447     0.000000000000000    60.564046184799722    13.785267177170063  1779.128360250472269    20.803074903204376
+   49.299999999999997  7996.629939381614349    16.603768791231360    13.271211947861786     0.000000000000000    83.452267447216968     0.000000000000000    57.382812174686279    13.420824644399442  1797.861210090768736    21.377965522222791
+   50.000000000000000  7994.334688267696038    15.400252492053291    12.297681951052731     0.000000000000000    77.795346631729245     0.000000000000000    55.181216442351186    13.147729698633986  1810.072170158729932    21.770914357755082
diff --git a/cpp/tests/data/secihurd-compare.csv b/cpp/tests/data/secihurd-compare.csv
index 8529e29d74..fb3af4b256 100644
--- a/cpp/tests/data/secihurd-compare.csv
+++ b/cpp/tests/data/secihurd-compare.csv
@@ -1,53 +1,53 @@
-Time             S                E                C                C+               I                I+               H                U                R                D               
-0.00000000000000 9760.00000000000000 100.00000000000000 50.00000000000000 0.00000000000000 50.00000000000000 0.00000000000000 20.00000000000000 10.00000000000000 10.00000000000000 0.00000000000000
-0.10000000000000 9757.42416800660249 99.45942734938031 50.60117956769963 0.00000000000000 51.41459531421343 0.00000000000000 19.96451694491266 9.92280022151772 11.17122251607734 0.04209007959679
-1.10000000000000 9729.73822935108365 96.61405262946327 54.69290336240315 0.00000000000000 65.39532998355574 0.00000000000000 19.88725016539319 9.20487650567759 24.02150954463311 0.44584845778980
-2.10000000000000 9699.27905387816099 96.89585894471061 56.92573743843343 0.00000000000000 78.40954068334170 0.00000000000000 20.26085741240237 8.58599731300916 38.82159107453965 0.82136325540069
-3.10000000000000 9666.66005747353665 98.94832891542204 58.60320550442732 0.00000000000000 90.14924840973116 0.00000000000000 21.00186913116206 8.06517289220404 55.39931010956984 1.17280756394535
-4.10000000000000 9632.16888828739684 102.05388070631193 60.27541098270837 0.00000000000000 100.71894479183956 0.00000000000000 22.03301832365489 7.63914777981092 73.60644630561536 1.50426282266094
-5.10000000000000 9595.93469741528679 105.82122688376961 62.14699820552495 0.00000000000000 110.35311049029475 0.00000000000000 23.29080612845530 7.30301959662264 93.33050557004265 1.81963571000186
-6.10000000000000 9558.01046606096497 110.02832106598566 64.27043218231360 0.00000000000000 119.29763723887390 0.00000000000000 24.72612424422264 7.05087984469424 114.49353698091815 2.12260238202620
-7.10000000000000 9518.41368675408376 114.54259831801417 66.63588828751963 0.00000000000000 127.76606120226214 0.00000000000000 26.30233629967227 6.87634393332929 137.04650755335831 2.41657765175944
-8.10000000000000 9477.14661376928234 119.27986282214239 69.21179477055334 0.00000000000000 135.92846680685832 0.00000000000000 27.99273563422144 6.77294290941824 160.96287965486059 2.70470363266192
-9.10000000000000 9434.20647419451416 124.18268186404171 71.96215382125030 0.00000000000000 143.91351232244796 0.00000000000000 29.77814572566570 6.73439000125524 186.23278986414527 2.98985220667820
-10.10000000000000 9389.59073083324256 129.20875480572499 74.85318433791723 0.00000000000000 151.81479779405788 0.00000000000000 31.64491345997218 6.75474715807913 212.85823506434096 3.27463654666434
-11.10000000000000 9343.29985646903333 134.32450750111536 77.85524640515213 0.00000000000000 159.69785402319786 0.00000000000000 33.58332742720117 6.82851708190157 240.84926307578169 3.56142801661643
-12.10000000000000 9295.33609508546397 139.50397194667516 80.94305793895693 0.00000000000000 167.60637914764339 0.00000000000000 35.58641209922703 6.95068241175742 270.22102559441822 3.85237577585821
-13.10000000000000 9245.70154983149951 144.72818603454030 84.09595592766161 0.00000000000000 175.56757947051128 0.00000000000000 37.64903100538753 7.11670906026030 300.99156144075278 4.14942722938700
-14.10000000000000 9194.40194694968341 149.98012975721116 87.29704443871128 0.00000000000000 183.59657504576168 0.00000000000000 39.76723965537877 7.32252660149343 333.18018945638164 4.45434809537916
-15.10000000000000 9141.44721920367920 155.24373433184743 90.53202651736845 0.00000000000000 191.69962316606865 0.00000000000000 41.93782762193025 7.56449517447013 366.80633265320739 4.76874133142960
-16.10000000000000 9086.85168658058319 160.50347166665267 93.78835821401293 0.00000000000000 199.87641616288315 0.00000000000000 44.15799549751331 7.83936539473592 401.88864198738429 5.09406449623590
-17.10000000000000 9030.63423968906136 165.74405165755911 97.05464961046424 0.00000000000000 208.12171792570808 0.00000000000000 46.42512771005636 8.14423554204362 438.44433251716640 5.43164534794207
-18.10000000000000 8972.81852750555845 170.95019695646067 100.32023793408769 0.00000000000000 216.42653003431730 0.00000000000000 48.73663333628937 8.47650876246871 476.48866984449205 5.78269562632743
-19.10000000000000 8913.43315071018333 176.10647336984005 103.57488103349104 0.00000000000000 224.77892214700236 0.00000000000000 51.08983509164602 8.83385197086016 516.03456261889096 6.14832305808844
-20.10000000000000 8852.51186089230578 181.19716074189634 106.80853539979920 0.00000000000000 233.16462196737677 0.00000000000000 53.48189237024469 9.21415742477854 557.09222952398648 6.52954167961474
-21.10000000000000 8790.09376470134703 186.20615427908524 110.01119399500132 0.00000000000000 241.56743256399602 0.00000000000000 55.90974825458053 9.61550746171374 599.66891814239477 6.92728060188415
-22.10000000000000 8726.22353070789177 191.11689009522345 113.17276694533260 0.00000000000000 249.96952551351444 0.00000000000000 58.37009329992316 10.03614257568840 643.76865950669219 7.34239135573762
-23.10000000000000 8660.95159538901862 195.91229158682924 116.28299368877627 0.00000000000000 258.35164483488472 0.00000000000000 60.85934096576539 10.47443280710566 689.39204676898873 7.77565395863501
-24.10000000000000 8594.33436329750657 200.57473532108597 119.33137911146390 0.00000000000000 266.69324726913192 0.00000000000000 63.37361105747465 10.92885229573729 736.53602980755909 8.22778184004344
-25.10000000000000 8526.43439514873353 205.08603661013495 122.30714903012627 0.00000000000000 274.97259793149021 0.00000000000000 65.90871862584174 11.39795677651498 785.19372012253257 8.69942575462925
-26.10000000000000 8457.32057629576411 209.42745598196183 125.19922239361797 0.00000000000000 283.16683586595570 0.00000000000000 68.46016657051389 11.88036376416830 835.35420232572278 9.19117680229951
-27.10000000000000 8387.06825690297228 213.57972842692024 127.99619900370880 0.00000000000000 291.25202095749609 0.00000000000000 71.02314078972080 12.37473516385190 887.00235009218409 9.70356866315031
-28.10000000000000 8315.75935411974206 217.52311765702476 130.68636254312182 0.00000000000000 299.20317156709433 0.00000000000000 73.59250717229429 12.87976205246797 940.11864574387403 10.23707914438573
-29.10000000000000 8243.26897564700812 221.45178748633026 133.25683966751672 0.00000000000000 306.99430083310369 0.00000000000000 76.16281007970537 13.39415139370402 994.67900376679449 10.79213112584151
-30.10000000000000 8200.48526471681544 197.47415022266617 133.12604392769592 0.00000000000000 314.28996719837204 0.00000000000000 78.72581905763559 13.91661354954175 1050.61304833314284 11.36909299413529
-31.10000000000000 8179.01540024877977 162.89195529275923 124.50966416770670 0.00000000000000 318.51593997201434 0.00000000000000 81.23056083850575 14.44526808383169 1107.42293999935623 11.96827139705135
-32.10000000000000 8158.75902413003132 136.53797585890453 111.93397568978739 0.00000000000000 317.46787452723015 0.00000000000000 83.53759681691422 14.97568111213374 1164.19802503527353 12.58984682973004
-33.10000000000000 8140.03468735581919 115.93831342186238 98.62930527688025 0.00000000000000 311.10109953734360 0.00000000000000 85.48947532298016 15.49937770833514 1220.07401303319853 13.23372834358541
-34.10000000000000 8122.89387671714667 99.50809954636671 86.07385630799583 0.00000000000000 300.31252520975193 0.00000000000000 86.96122105718395 16.00478200630931 1274.34624324358651 13.89939591166387
-35.10000000000000 8107.27142042098967 86.18572556428147 74.84917572716948 0.00000000000000 286.26145303359942 0.00000000000000 87.87525867973817 16.47886489416532 1326.49229813374177 14.58580354631948
-36.10000000000000 8093.07100569146314 75.21966603138546 65.09143189253817 0.00000000000000 270.06013642425637 0.00000000000000 88.19942914511837 16.90872554840443 1376.15825286727704 15.29135239956143
-37.10000000000000 8080.20133585708663 66.05603211926808 56.72562843290206 0.00000000000000 252.65058252639213 0.00000000000000 87.93852462949866 17.28279228069177 1423.13118102168596 16.01392313247897
-38.10000000000000 8068.56262501990022 58.29690747609131 49.59177051653302 0.00000000000000 234.77290010926484 0.00000000000000 87.12433259491776 17.59158603678232 1467.30892853640444 16.75094971011086
-39.10000000000000 8058.05244760506048 51.65328398907927 43.51026173492230 0.00000000000000 216.97744388098465 0.00000000000000 85.80645975914078 17.82809876542973 1508.67248723392709 17.49951703146073
-40.10000000000000 8048.57106872879467 45.91132884916026 38.31164055929298 0.00000000000000 199.65392099684667 0.00000000000000 84.04480455319252 17.98787570523153 1547.26289265147466 18.25646795601193
-41.10000000000000 8040.02413296684153 40.90994120555013 33.84791881406700 0.00000000000000 183.06393115226354 0.00000000000000 81.90381499234441 18.06889226746618 1583.16285943688263 19.01850916459030
-42.10000000000000 8032.32386986352685 36.52558765957559 29.99496814619312 0.00000000000000 167.37094006342417 0.00000000000000 79.44835193778971 18.07130281118242 1616.48267064967422 19.78230886863959
-43.10000000000000 8025.38947554135939 32.66190475636740 26.65091079571167 0.00000000000000 152.66552719125286 0.00000000000000 76.74087046816206 17.99712119277742 1647.34960777189599 20.54458228247920
-44.10000000000000 8019.14704591892769 29.24247112201027 23.73303309432334 0.00000000000000 138.98558692977366 0.00000000000000 73.83962450646905 17.84987637850923 1675.90019910507885 21.30216294491359
-45.10000000000000 8013.52927524416464 26.20571760981716 21.17443666706323 0.00000000000000 126.33195759680623 0.00000000000000 70.79763397920482 17.63427249592522 1702.27464690622742 22.05205950079685
-46.10000000000000 8008.47504122160717 23.50129896688165 18.92096088524433 0.00000000000000 114.68022347457311 0.00000000000000 67.66220080951283 17.35587186108831 1726.61290422641036 22.79149855468737
-47.10000000000000 8003.92894509990219 21.08747690227999 16.92856585059912 0.00000000000000 103.98945790666005 0.00000000000000 64.47480658783135 17.02081150115228 1749.05198133817930 23.51795481340114
-48.10000000000000 7999.84084473854455 18.92921094525236 15.16120071824191 0.00000000000000 94.20859326541573 0.00000000000000 61.27126538818517 16.63555801635884 1769.72415687649345 24.22917005151288
-49.10000000000000 7996.16540124720086 16.99674972514239 13.58911131653709 0.00000000000000 85.28098792803146 0.00000000000000 58.08203838912079 16.20670178089632 1788.75584706136237 24.92316255171389
-50.00000000000000 7993.17638252225152 15.42943711043520 12.32062487449738 0.00000000000000 77.92692837057375 0.00000000000000 55.24515753967167 15.78886448206867 1804.58098849539601 25.53161660511103
+#Time                 S                     E                     C                     C+                    I                     I+                    H                     U                     R                     D                    
+    0.000000000000000  9760.000000000000000   100.000000000000000    50.000000000000000     0.000000000000000    50.000000000000000     0.000000000000000    20.000000000000000    10.000000000000000    10.000000000000000     0.000000000000000
+    0.300000000000000  9752.155889545332684    98.541266609374318    51.672567760899234     0.000000000000000    54.247528564117168     0.000000000000000    19.909182783552133     9.771333293539174    13.576929473658531     0.125301969526818
+    1.300000000000000  9723.841585915444739    96.477190718622097    55.229756902301759     0.000000000000000    68.095588110911535     0.000000000000000    19.928507087266141     9.073173133047458    26.831121275497384     0.523076856909698
+    2.300000000000000  9692.915399599702141    97.194530820489902    57.280277114429765     0.000000000000000    80.859869351156178     0.000000000000000    20.382294758456311     8.474063222470168    42.000119876036578     0.893445257259982
+    3.300000000000000  9659.905799362988546    99.501244608052104    58.928002546908751     0.000000000000000    92.350229153536347     0.000000000000000    21.187129302270378     7.972521232038987    58.914503987748915     1.240569806456310
+    4.300000000000000  9625.059003968484831   102.763358347964328    60.630589120945309     0.000000000000000   102.712558779973378     0.000000000000000    22.268213790671659     7.564908537081408    77.432864659748631     1.568502795131097
+    5.300000000000000  9588.484134605647341   106.632693802540373    62.551264788230718     0.000000000000000   112.189782915914506     0.000000000000000    23.565003620232712     7.246072721898597    97.449939146970365     1.881108398565686
+    6.300000000000000  9550.224698172809440   110.909834761144594    64.724993524629866     0.000000000000000   121.023341004881360     0.000000000000000    25.031077192637269     7.009972023436737   118.894071056308690     2.182012264152157
+    7.300000000000000  9510.293950581542958   115.474351285052961    67.135375375133393     0.000000000000000   129.418346250482642     0.000000000000000    26.631989970878891     6.850177941413275   141.721233541027431     2.474575054468708
+    8.300000000000001  9468.692535944892370   120.248707737105320    69.749040649800563     0.000000000000000   137.536208646956652     0.000000000000000    28.342722618832397     6.760240212345927   165.908659902466184     2.761884287601241
+    9.300000000000001  9425.417412337492351   125.179210880093834    72.530116485955091     0.000000000000000   145.498009563442821     0.000000000000000    30.145350034650239     6.733931216664847   191.449210518304710     3.046758963396046
+   10.300000000000001  9380.466479210150283   130.225699130943013    75.445586456087000     0.000000000000000   153.391188736497384     0.000000000000000    32.027121049044219     6.765395665387888   218.346767330554911     3.331762421334881
+   11.300000000000001  9333.840887851763910   135.355974401497519    78.466677268939080     0.000000000000000   161.276443052654884     0.000000000000000    33.978957086073599     6.849230477963984   246.612609894563292     3.619219966542732
+   12.300000000000001  9285.542706423091659   140.545809943397359    81.569021962780724     0.000000000000000   169.193770805444245     0.000000000000000    35.994313384625301     6.980515579492048   276.262623131962982     3.911238769204657
+   13.300000000000001  9235.574557614103469   145.776892360904384    84.732812895132511     0.000000000000000   177.167646122391659     0.000000000000000    38.068336715474054     7.154811733600313   307.315214238881254     4.209728319511274
+   14.300000000000001  9183.942994985582118   151.032430418550405    87.941757720873014     0.000000000000000   185.211192096573001     0.000000000000000    40.197261046437696     7.368137578092254   339.789805838823156     4.516420315067005
+   15.300000000000001  9130.658814419686678   156.296491949919044    91.181968979990060     0.000000000000000   193.329193507288323     0.000000000000000    42.377980434404371     7.616934693506525   373.705728715710165     4.832887299494067
+   16.300000000000001  9075.737235338468963   161.553617609545142    94.441175227906470     0.000000000000000   201.520243440527310     0.000000000000000    44.607747879935481     7.898026685487926   409.081394136419476     5.160559681708342
+   17.300000000000001  9019.198084888643280   166.788535702215341    97.708161727519283     0.000000000000000   209.778272461445511     0.000000000000000    46.883963676653231     8.208576195960514   445.933664375930277     5.500740971631995
+   18.300000000000001  8961.065986755906124   171.985949538750504   100.972371240550672     0.000000000000000   218.093638248118481     0.000000000000000    49.204027235603462     8.546042337570805   484.277363441867976     5.854621201631612
+   19.300000000000001  8901.370555700634213   177.130376935168385   104.223616894819685     0.000000000000000   226.453901277548027     0.000000000000000    51.565233865556046     8.908140071084766   524.124886668721615     6.223288586467064
+   20.300000000000001  8840.146597873486826   182.206027836416240   107.451873870607400     0.000000000000000   234.844375553661052     0.000000000000000    53.964703306381935     9.292802384839517   565.485879650726815     6.607739523879092
+   21.300000000000001  8777.434315733058611   187.196710872984283   110.647126958952626     0.000000000000000   243.248517716030420     0.000000000000000    56.399330592623130     9.698145693679056   608.366965368394176     7.008887064277016
+   22.300000000000001  8713.279515063788494   192.085763263825868   113.799258315622836     0.000000000000000   251.648199895972255     0.000000000000000    58.865752522306401    10.122438585268805   652.771504364146836     7.427567989068049
+   23.300000000000001  8647.733810237161379   196.856001142548195   116.897964900386796     0.000000000000000   260.023899121073157     0.000000000000000    61.360324941341815    10.564073857512938   698.699377161597909     7.864548638378063
+   24.300000000000001  8580.854822507748395   201.489689328591993   119.932698779750538     0.000000000000000   268.354827317369427     0.000000000000000    63.879107451609229    11.021543679269142   746.146781311690688     8.320529623970200
+   25.300000000000001  8512.706364819257942   205.968530957129076   122.892626110266264     0.000000000000000   276.619019896427176     0.000000000000000    66.417853169836064    11.493417644818924   795.106037847634184     8.796149554630000
+   26.300000000000001  8443.358605349449135   210.273678338719378   125.766602502550725     0.000000000000000   284.793396744709923     0.000000000000000    68.972001916471697    11.978323464691210   845.565403792506913     9.291987890901432
+   27.300000000000001  8372.888200888754000   214.385767022737753   128.543163795163395     0.000000000000000   292.853806585304540     0.000000000000000    71.536675777565264    12.474930030393086   897.508888865072322     9.808567035010725
+   28.300000000000001  8301.378390175366803   218.284975339408760   131.210532180787339     0.000000000000000   300.775063747856052     0.000000000000000    74.106676413074723    12.981932600706491   950.916075791903722    10.346353750896606
+   29.300000000000001  8230.029983002321387   220.917481905355032   133.679321593367348     0.000000000000000   308.530985064548474     0.000000000000000    76.676483820090397    13.498039877151749  1005.761944738168609    10.905759998997377
+   30.300000000000001  8196.751788897576262   189.365410132966588   131.742487462333514     0.000000000000000   315.471143808338184     0.000000000000000    79.233927234771187    14.021937175250745  1061.926162145771968    11.487143142991973
+   31.300000000000001  8175.502854937604752   156.766598574951956   121.955173188197463     0.000000000000000   318.639662653176970     0.000000000000000    81.709810916857734    14.551373064255069  1118.783734879865733    12.090791785090753
+   32.299999999999997  8155.562894200220398   131.783800937916823   109.070058274115254     0.000000000000000   316.418384254303419     0.000000000000000    83.953259177930576    15.081089413994025  1175.413671229202464    12.716842512317898
+   33.299999999999997  8137.178725584822132   112.167945676592637    95.860129923912851     0.000000000000000   309.032626190731833     0.000000000000000    85.811668858535128    15.601835356224079  1230.981943888166370    13.365124521015790
+   34.299999999999997  8120.368959272626853    96.465757150219446    83.568120560698731     0.000000000000000   297.467819428639984     0.000000000000000    87.169893551942721    16.101594882976681  1284.822843256969918    14.035011895926173
+   35.299999999999997  8105.056498328774978    83.694176066470774    72.657516446580757     0.000000000000000   282.887133617027871     0.000000000000000    87.960512740072375    16.567257886920576  1336.451562997931660    14.725341916221705
+   36.299999999999997  8091.146274483253364    73.148035452980793    63.207541446056936     0.000000000000000   266.371246174081307     0.000000000000000    88.159954591628605    16.986131090047948  1385.546414758987794    15.434402002963656
+   37.299999999999997  8078.545954975349559    64.309561291427585    55.118435228919481     0.000000000000000   248.819343861652612     0.000000000000000    87.779476549796271    17.347044346231069  1431.920211454984383    16.159972291639768
+   38.299999999999997  8067.154674195767257    56.807156572862141    48.222825218761557     0.000000000000000   230.929290527438411     0.000000000000000    86.855272665481891    17.641026178627541  1475.490348929111178    16.899405711951026
+   39.299999999999997  8056.870316963355435    50.369893920970242    42.341949795091942     0.000000000000000   213.214793261289742     0.000000000000000    85.439619465315488    17.861612103419702  1516.252085944095143    17.649728546463635
+   40.299999999999997  8047.594174029745773    44.796565079967820    37.310531362597352     0.000000000000000   196.035897780189117     0.000000000000000    83.593734703123502    18.004876849324070  1554.256472343512314    18.407747851541828
+   41.299999999999997  8039.233251201205348    39.935023267513522    32.985707718826362     0.000000000000000   179.631244973255207     0.000000000000000    81.382396816445308    18.069278884915189  1589.592941154545997    19.170155983294801
+   42.299999999999997  8031.701263189383099    35.668182870092309    29.248309543137839     0.000000000000000   164.147107291454461     0.000000000000000    78.870111627806779    18.055390899804898  1622.376008662783534    19.933625915538958
+   43.299999999999997  8024.918899217480430    31.904392686291079    26.000809129851785     0.000000000000000   149.661543092497197     0.000000000000000    76.118532698121896    17.965572424803199  1652.735356971824103    20.694893779132396
+   44.299999999999997  8018.813694685431983    28.570725852146072    23.164119561832734     0.000000000000000   136.203571505083204     0.000000000000000    73.184846032026655    17.803624686444781  1680.808590599771833    21.450827077264339
+   45.299999999999997  8013.319699079724160    25.608242622227721    20.674280595439299     0.000000000000000   123.767926129620378     0.000000000000000    70.120868142812355    17.574454537259260  1706.736050458513319    22.198478434404688
+   46.299999999999997  8008.377047950543783    22.968605237741009    18.479473447670930     0.000000000000000   112.326149410115278     0.000000000000000    66.972654027755311    17.283764097073060  1730.657180184400431    22.935125644701081
+   47.299999999999997  8003.931499609763705    20.611630665273424    16.537509243853734     0.000000000000000   101.834782532330223     0.000000000000000    63.780457099969617    16.937775261355419  1752.708046265760231    23.658299321694741
+   48.299999999999997  7999.933970141841201    18.503501078472645    14.813795998713942     0.000000000000000    92.241312818669698     0.000000000000000    60.578922185349889    16.542992984232729  1773.019705072455963    24.365799720264970
+   49.299999999999997  7996.340084779531935    16.615440298745561    13.279730655110427     0.000000000000000    83.488423340770481     0.000000000000000    57.397424298432291    16.106007723031848  1791.717184517193346    25.055704387184779
+   50.000000000000000  7994.042905626009997    15.411360579900657    12.305783866542539     0.000000000000000    77.829883743443332     0.000000000000000    55.195612856903807    15.778503493275359  1803.908673566597372    25.527276267327284
diff --git a/cpp/tests/test_numericalIntegration.cpp b/cpp/tests/test_numericalIntegration.cpp
index fd9879579c..769b6b1a55 100644
--- a/cpp/tests/test_numericalIntegration.cpp
+++ b/cpp/tests/test_numericalIntegration.cpp
@@ -89,10 +89,10 @@ TEST_F(TestVerifyNumericalIntegratorEuler, euler_sine)
     EXPECT_NEAR(err, 0.0, 1e-3);
 }
 
-using TestTypes = ::testing::Types<mio::RKIntegratorCore,
-                                   mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_cash_karp54>,
-                                   mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>,
-                                   mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_fehlberg78>>;
+using TestTypes = ::testing::Types<
+    mio::RKIntegratorCore, mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_cash_karp54>,
+    // mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_dopri5>, // TODO: reenable once boost bug is fixed
+    mio::ControlledStepperWrapper<boost::numeric::odeint::runge_kutta_fehlberg78>>;
 
 TYPED_TEST_SUITE(TestVerifyNumericalIntegrator, TestTypes);
 
@@ -139,6 +139,88 @@ TYPED_TEST(TestVerifyNumericalIntegrator, sine)
     EXPECT_NEAR(this->err, 0.0, 1e-7);
 }
 
+TYPED_TEST(TestVerifyNumericalIntegrator, adaptiveStepSizing)
+{
+    // this test checks all requirements on adaptive step sizing for IntegratorCore::step
+    // set fixed tolarances to control when a integration step fails
+    const double tol    = 1;
+    const double dt_min = 1, dt_max = 2 * dt_min;
+
+    this->y   = {Eigen::VectorXd::Zero(3)};
+    this->sol = {Eigen::VectorXd::Zero(3)};
+
+    TypeParam integrator;
+    integrator.set_abs_tolerance(tol);
+    integrator.set_rel_tolerance(tol);
+    integrator.set_dt_min(dt_min);
+    integrator.set_dt_max(dt_max);
+
+    double t_eval;
+    bool step_okay;
+
+    // this deriv function is supposed to (not guaranteed to!) break any integrator
+    double c        = 1;
+    auto deriv_fail = [&c, tol](const auto&&, auto&&, auto&& dxds) {
+        c /= -10 * tol;
+        dxds.array() = 1 / c; // increasing oscillation with each evaluation (indep. of t and dt)
+    };
+    // this deriv function is trivially integrable
+    auto deriv_success = [](const auto&&, auto&&, auto&& dxds) {
+        dxds.setZero(); // const f
+    };
+
+    // check that on a failed step, dt does decrease, but not below dt_min
+
+    t_eval    = 0;
+    this->dt  = dt_max;
+    step_okay = integrator.step(deriv_fail, this->y[0], t_eval, this->dt, this->sol[0]);
+
+    EXPECT_EQ(step_okay, false); // step sizing should fail
+    EXPECT_EQ(this->dt, dt_min); // new step size should fall back to dt_min
+    EXPECT_EQ(t_eval, dt_min); // a step must be made with no less than dt_min
+
+    // check that on a successful step, dt increases from dt_min
+
+    t_eval    = 0;
+    this->dt  = dt_min;
+    step_okay = integrator.step(deriv_success, this->y[0], t_eval, this->dt, this->sol[0]);
+
+    EXPECT_EQ(step_okay, true); // step sizing must be okay
+    EXPECT_GE(this->dt, dt_min); // new step size may be larger
+    EXPECT_LE(this->dt, dt_max); // but not too large
+    EXPECT_EQ(t_eval, dt_min); // used step size should still be dt_min
+
+    // check that on a successful step, dt does not increase from dt_max
+
+    t_eval    = 0;
+    this->dt  = dt_max;
+    step_okay = integrator.step(deriv_success, this->y[0], t_eval, this->dt, this->sol[0]);
+
+    EXPECT_EQ(step_okay, true); // step sizing must be okay
+    EXPECT_EQ(this->dt, dt_max); // new step size must not increase from dt_max
+    EXPECT_EQ(t_eval, dt_max); // used step size should be dt_max
+
+    // check that the integrator does not make time steps for dt not in [dt_min, dt_max]
+
+    t_eval    = 0;
+    this->dt  = 0.5 * dt_min;
+    step_okay = integrator.step(deriv_success, this->y[0], t_eval, this->dt, this->sol[0]);
+
+    EXPECT_EQ(step_okay, true); // step sizing must be okay
+    EXPECT_GE(this->dt, dt_min); // new step size must be bounded from below
+    EXPECT_LE(this->dt, dt_max); // and above
+    EXPECT_EQ(t_eval, dt_min); // step size should fall back to dt_min
+
+    t_eval    = 0;
+    this->dt  = 2.0 * dt_max;
+    step_okay = integrator.step(deriv_success, this->y[0], t_eval, this->dt, this->sol[0]);
+
+    EXPECT_EQ(step_okay, true); // step sizing must be okay
+    EXPECT_GE(this->dt, dt_min); // new step size must be bounded
+    EXPECT_LE(this->dt, dt_max); // and above
+    EXPECT_EQ(t_eval, dt_max); // step size should fall back to dt_max
+}
+
 auto DoStep()
 {
     return testing::DoAll(testing::WithArgs<2, 3>(AddAssign()), testing::WithArgs<4, 1>(AssignUnsafe()),
diff --git a/cpp/tests/test_odesecir.cpp b/cpp/tests/test_odesecir.cpp
index ad7ecbb8c4..8a8bd4cae0 100644
--- a/cpp/tests/test_odesecir.cpp
+++ b/cpp/tests/test_odesecir.cpp
@@ -87,7 +87,7 @@ TEST(TestOdeSecir, compareWithPreviousRun)
     auto integrator = std::make_shared<mio::RKIntegratorCore>();
     integrator->set_dt_min(0.3);
     integrator->set_dt_max(1.0);
-    integrator->set_rel_tolerance(1e-4);
+    integrator->set_rel_tolerance(1e-3);
     integrator->set_abs_tolerance(1e-1);
     mio::TimeSeries<double> secihurd = simulate(t0, tmax, dt, model, integrator);