diff --git a/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
index 71761b228ab1cd241ff0c974f253204129116377..26ecc1d083772229d088701819f1cd558831d9b3 100644
--- a/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
+++ b/extreme_fit/estimator/margin_estimator/abstract_margin_estimator.py
@@ -58,4 +58,5 @@ class LinearMarginEstimator(AbstractMarginEstimator):
             gev_params = self.function_from_fit.get_gev_params(coordinate, is_transformed=False)
             p = gev_params.density(maximum)
             nllh -= np.log(p)
+            assert not np.isinf(nllh)
         return nllh
diff --git a/extreme_fit/model/result_from_model_fit/result_from_extremes/result_from_mle_extremes.py b/extreme_fit/model/result_from_model_fit/result_from_extremes/result_from_mle_extremes.py
index 9333ff44fc5a64efca60f61c603ba0f192dcc596..14ea112bc2ca13783a73c1daa89f5d7e495fef1b 100644
--- a/extreme_fit/model/result_from_model_fit/result_from_extremes/result_from_mle_extremes.py
+++ b/extreme_fit/model/result_from_model_fit/result_from_extremes/result_from_mle_extremes.py
@@ -1,5 +1,4 @@
 import numpy as np
-import rpy2
 from rpy2 import robjects
 
 from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_result_from_extremes import \
diff --git a/test/test_projects/test_contrasting/test_two_fold_fit.py b/test/test_projects/test_contrasting/test_two_fold_fit.py
index 023816ea4265f80b66f558fad36c50d5aa3cc53f..8530a74ea69561673b521ecdffdbbb62d946bb5d 100644
--- a/test/test_projects/test_contrasting/test_two_fold_fit.py
+++ b/test/test_projects/test_contrasting/test_two_fold_fit.py
@@ -21,7 +21,7 @@ class TestTwoFoldFit(unittest.TestCase):
         set_seed_for_test()
         altitudes = [900, 1200]
         study_class = SafranSnowfall1Day
-        studies = AltitudesStudies(study_class, altitudes, year_min=1959, year_max=1963)
+        studies = AltitudesStudies(study_class, altitudes, year_min=1959, year_max=1989)
         self.two_fold_datasets_generator = TwoFoldDatasetsGenerator(studies, nb_samples=2, massif_names=['Vercors'])
         self.model_family_name_to_model_class = {'Stationary': [ConstantMarginModel],
                                                  'Linear': [ConstantMarginModel, LinearLocationAllDimsMarginModel]}
@@ -34,7 +34,7 @@ class TestTwoFoldFit(unittest.TestCase):
     def test_best_fit_spatial_extreme(self):
         two_fold_fit = self.load_two_fold_fit(fit_method=MarginFitMethod.spatial_extremes_mle)
         best_model_class = two_fold_fit.massif_name_to_best_model()['Vercors']
-        self.assertEqual(best_model_class, ConstantMarginModel)
+        self.assertEqual(best_model_class, LinearLocationAllDimsMarginModel)
 
 
 if __name__ == '__main__':