diff --git a/DESCRIPTION b/DESCRIPTION
index 1700491ba8fcc927dfd059484765ebb3c939211b..0cd270d72c41b3aca2168907eb1bbff1a1cd704c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -92,3 +92,4 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.2.0
+Config/testthat/edition: 3
\ No newline at end of file
diff --git a/tests/testthat/test-BEI_PDFBest.R b/tests/testthat/test-BEI_PDFBest.R
index 55070e81341699ca5fca573cd25bfbd0cd1ca3b4..bf27a5aaabe57887ea9f9db403eac2997bfeda9f 100644
--- a/tests/testthat/test-BEI_PDFBest.R
+++ b/tests/testthat/test-BEI_PDFBest.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 test_that("basic use case", {
   index_obs<- c(2, 3, 0.6)
   dim(index_obs) <- c(time = 3)
diff --git a/tests/testthat/test-BEI_Weights.R b/tests/testthat/test-BEI_Weights.R
index 26347eb6c78f9e38d70a56ea837239ba06e1fc32..888b231e866cb45b916c0e2b5177476045085dde 100644
--- a/tests/testthat/test-BEI_Weights.R
+++ b/tests/testthat/test-BEI_Weights.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 test_that("basic use case", {
   index_weight <- 1 : (3 * 3)
   dim(index_weight) <- c(sdate = 3, member = 3)
diff --git a/tests/testthat/test-CST_Analogs.R b/tests/testthat/test-CST_Analogs.R
index 66e1c88a8026878285ee3a705014184e0319f88a..80e5da861cba5e430e3c5dd78b6c7f143d298156 100644
--- a/tests/testthat/test-CST_Analogs.R
+++ b/tests/testthat/test-CST_Analogs.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Analogs tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Anomaly.R b/tests/testthat/test-CST_Anomaly.R
index a4c7f3f57778c5cfde40bb4b25a1a1490143d757..772352aa1e4280219b83f0dff812401731dceddb 100644
--- a/tests/testthat/test-CST_Anomaly.R
+++ b/tests/testthat/test-CST_Anomaly.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Anomaly tests")
-
 ##############################################
 # dat
 set.seed(1)
diff --git a/tests/testthat/test-CST_BEI_Weighting.R b/tests/testthat/test-CST_BEI_Weighting.R
index 3a70f38aa20452884e95d338711c0daea432fb62..bf2579c0c9db96ad1277efaa27e43b3171799baa 100644
--- a/tests/testthat/test-CST_BEI_Weighting.R
+++ b/tests/testthat/test-CST_BEI_Weighting.R
@@ -1,4 +1,4 @@
-context("CSTools::CST_CST_BEI_Weighting tests")
+##############################################
 
 # dat
 var_exp <- array(1:6, dim = c(sdate = 2, member = 3))
diff --git a/tests/testthat/test-CST_BiasCorrection.R b/tests/testthat/test-CST_BiasCorrection.R
index 46f57ace7e5e861925901f05657a328fca5ed17b..ec9b596e889a56798bfab20e55df2e467eece00a 100644
--- a/tests/testthat/test-CST_BiasCorrection.R
+++ b/tests/testthat/test-CST_BiasCorrection.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_BiasCorrection tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Calibration.R b/tests/testthat/test-CST_Calibration.R
index e6aef6f641559e7a35a379bb0bd24d294a6110fc..64a09e5a6cbc1f93a9a1a28ed05c4598adae7d56 100644
--- a/tests/testthat/test-CST_Calibration.R
+++ b/tests/testthat/test-CST_Calibration.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Calibration tests")
-
 ##############################################
 
 # dat
diff --git a/tests/testthat/test-CST_CategoricalEnsCombination.R b/tests/testthat/test-CST_CategoricalEnsCombination.R
index 2dfc4a036026d002f628018a140637f51466f2b5..a52f822b9a4a28ff8545caaa067e3587b3ea79dd 100644
--- a/tests/testthat/test-CST_CategoricalEnsCombination.R
+++ b/tests/testthat/test-CST_CategoricalEnsCombination.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_CategoricalEnsCombination tests")
-
 ##############################################
+
 # dat1
 dat_exp <- array(abs(rnorm(4*6*3*4*4))*275, dim = c(dataset = 1, member = 4, sdate = 6, 
                                                     ftime = 3, lat = 4, lon = 4))
diff --git a/tests/testthat/test-CST_EnsClustering.R b/tests/testthat/test-CST_EnsClustering.R
index afbe1598d740bc649fc6579abd9effb048044afd..3415a4894b82d5e015437c220ffbc1ec98fc51d9 100644
--- a/tests/testthat/test-CST_EnsClustering.R
+++ b/tests/testthat/test-CST_EnsClustering.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_EnsClustering tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_InsertDim.R b/tests/testthat/test-CST_InsertDim.R
index 39e5ade86562f5aaf1f00c61a10d54f479bd34c2..c4f4b1d81ee89304c0dfc65a0e3ae4fd6c0c8c2e 100644
--- a/tests/testthat/test-CST_InsertDim.R
+++ b/tests/testthat/test-CST_InsertDim.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_InsertDim tests")
-
 ##############################################
 exp <- lonlat_temp$exp
 ##############################################
diff --git a/tests/testthat/test-CST_MergeDims.R b/tests/testthat/test-CST_MergeDims.R
index 45bcd8e960248b8f3168047786c780dfe9f1b7cd..0717a3064d595dc117326ee80be445884095b3cf 100644
--- a/tests/testthat/test-CST_MergeDims.R
+++ b/tests/testthat/test-CST_MergeDims.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     CST_MergeDims(data = 1),
diff --git a/tests/testthat/test-CST_MultiEOF.R b/tests/testthat/test-CST_MultiEOF.R
index f4843231cc664f85c586e49862c123f3afcc1005..66a6352516148ddc6e88ae0148c3c404202f55ec 100644
--- a/tests/testthat/test-CST_MultiEOF.R
+++ b/tests/testthat/test-CST_MultiEOF.R
@@ -1,6 +1,3 @@
-context("CSTools::CST_MultiEOF tests")
-
-
 ##############################################
 
 # exp1, exp2, exp03
diff --git a/tests/testthat/test-CST_MultiMetric.R b/tests/testthat/test-CST_MultiMetric.R
index 5c45e6a5da6590f7304920621e9efb67579809d8..952ec5b75ed6ff2c086b3c150d3fc9449303a00b 100644
--- a/tests/testthat/test-CST_MultiMetric.R
+++ b/tests/testthat/test-CST_MultiMetric.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_MultiMetric")
-
 ################################################################################
 
 # dat
diff --git a/tests/testthat/test-CST_MultivarRMSE.R b/tests/testthat/test-CST_MultivarRMSE.R
index b9f93f6862a42efe4c956608f17b8b33c761cd9e..f7bc347c844773cf85c9c05e261bf73c528613cd 100644
--- a/tests/testthat/test-CST_MultivarRMSE.R
+++ b/tests/testthat/test-CST_MultivarRMSE.R
@@ -1,4 +1,4 @@
-context("CSTools::CST_MultivarRMSE tests")
+##############################################
 
 # dat1
 set.seed(1)
diff --git a/tests/testthat/test-CST_ProxiesAttractor.R b/tests/testthat/test-CST_ProxiesAttractor.R
index 65831b24a9fdd4e7beef7c625ed4b45577c44676..ce585e0b15eddd347c40ab1c74cd59d38c0817c4 100644
--- a/tests/testthat/test-CST_ProxiesAttractor.R
+++ b/tests/testthat/test-CST_ProxiesAttractor.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_ProxiesAttractor tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_QuantileMapping.R b/tests/testthat/test-CST_QuantileMapping.R
index a086ab93d3de7f2f6a4187bec54b0c5e95596e9b..e12f1d9a87353abf17019441dfc87c6b199efd3a 100644
--- a/tests/testthat/test-CST_QuantileMapping.R
+++ b/tests/testthat/test-CST_QuantileMapping.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_QuantileMapping tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_RFSlope.R b/tests/testthat/test-CST_RFSlope.R
index f08d3a591443fb5a3a79cd2bd89d8058b2441263..a4411b4fe6e4e2ef0f6826e571064c6d6b5cd26d 100644
--- a/tests/testthat/test-CST_RFSlope.R
+++ b/tests/testthat/test-CST_RFSlope.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFSlope tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RFTemp.R b/tests/testthat/test-CST_RFTemp.R
index 325b260becf999915a952fca004c4674335d1201..334a8909911e4b869fb2088f89940d43a64a524e 100644
--- a/tests/testthat/test-CST_RFTemp.R
+++ b/tests/testthat/test-CST_RFTemp.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_RFTemp tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_RFWeights.R b/tests/testthat/test-CST_RFWeights.R
index 68b45830fd751f7d1c820ef83e7563e1c8f8d40d..bb11f33606fc09418de45c3fb8352ad1d022365a 100644
--- a/tests/testthat/test-CST_RFWeights.R
+++ b/tests/testthat/test-CST_RFWeights.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFTWeights tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 6)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RainFARM.R b/tests/testthat/test-CST_RainFARM.R
index c014cfdc68e2fdd046efe7221f95264ff74e1795..dcb7dc6f1ff6367ed753b9bb09b05251c1534359 100644
--- a/tests/testthat/test-CST_RainFARM.R
+++ b/tests/testthat/test-CST_RainFARM.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFSlope tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RegimesAssign.R b/tests/testthat/test-CST_RegimesAssign.R
index 456aaf8172200d8e4a603019d023007994483e44..f7c835c1c82230bdf88448495d986d069c797577 100644
--- a/tests/testthat/test-CST_RegimesAssign.R
+++ b/tests/testthat/test-CST_RegimesAssign.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_RegimesAssign")
-
 ##############################################
 
 test_that("1. Input checks", {
diff --git a/tests/testthat/test-CST_SaveExp.R b/tests/testthat/test-CST_SaveExp.R
index 00630d61b2da03e788f5a233fc893105c2af7f19..7f6332703111445e711d9ad53a94d22c2d7ff43e 100644
--- a/tests/testthat/test-CST_SaveExp.R
+++ b/tests/testthat/test-CST_SaveExp.R
@@ -1,4 +1,3 @@
-context("CSTools::CST_SaveExp tests")
 ##############################################
 
 # cube0
diff --git a/tests/testthat/test-CST_SplitDim.R b/tests/testthat/test-CST_SplitDim.R
index c2652477c71fc52616aa41e3fd799f5c02be1638..0c8f2e013e815c94c8d88157aca12e60b3f2b0cc 100644
--- a/tests/testthat/test-CST_SplitDim.R
+++ b/tests/testthat/test-CST_SplitDim.R
@@ -1,6 +1,3 @@
-context("CSTools::CST_SplitDim tests")
-
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Subset.R b/tests/testthat/test-CST_Subset.R
index 9123000b3aad32497879d55d9a748213d2b8955f..2d270e38a1eb315f78f31ac191e9a0f5c7fcf29a 100644
--- a/tests/testthat/test-CST_Subset.R
+++ b/tests/testthat/test-CST_Subset.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Subset tests")
-
 ##############################################
 
 library(startR)
diff --git a/tests/testthat/test-CST_WeatherRegimes.R b/tests/testthat/test-CST_WeatherRegimes.R
index ebf8730de07460b2d92cde998ca211c6a9212503..796c551923623732e28b6ba0c00ebc8879d4ec59 100644
--- a/tests/testthat/test-CST_WeatherRegimes.R
+++ b/tests/testthat/test-CST_WeatherRegimes.R
@@ -1,6 +1,5 @@
-context("Generic tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-PlotForecastPDF.R b/tests/testthat/test-PlotForecastPDF.R
index f39b9667c47c91db81f126028802896c23ada36b..9a831ede6c39bb061d3dd875e76ba28f0353f6b3 100644
--- a/tests/testthat/test-PlotForecastPDF.R
+++ b/tests/testthat/test-PlotForecastPDF.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     PlotForecastPDF(fcst, tercile.limits),
diff --git a/tests/testthat/test-PlotPDFsOLE.R b/tests/testthat/test-PlotPDFsOLE.R
index 91e61d08c2c7c08c67d32d70410c1ee9c68f9770..68f5ada2b4ad989f1f5e7d5e68bba79fe39d9ec8 100644
--- a/tests/testthat/test-PlotPDFsOLE.R
+++ b/tests/testthat/test-PlotPDFsOLE.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 
 test_that("Sanity checks", {
   pdf_1 <- c(1.1,0.6)
diff --git a/tests/testthat/test-PlotTriangles4Categories.R b/tests/testthat/test-PlotTriangles4Categories.R
index 8105cc91388aba7a1ac20f80041907a5d7a2de0d..40a8b25b0a2cedf474ba9139a2b35c4210df9643 100644
--- a/tests/testthat/test-PlotTriangles4Categories.R
+++ b/tests/testthat/test-PlotTriangles4Categories.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     PlotTriangles4Categories(data = 1:20),
diff --git a/tests/testthat/test-PlotWeeklyClim.R b/tests/testthat/test-PlotWeeklyClim.R
index e7886fbc6836b809ca039dc577a37a65fd42037b..19aae749329b91b207050448928ff7668558bb37 100644
--- a/tests/testthat/test-PlotWeeklyClim.R
+++ b/tests/testthat/test-PlotWeeklyClim.R
@@ -1,5 +1,3 @@
-context("CSTools::PlotWeeklyClim tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-as.s2dv_cube.R b/tests/testthat/test-as.s2dv_cube.R
index 4872c9c372f6eff71a628ac138bcb5eddd4c5920..f2343080560a11e72ab0f643b7c8df2d9dd33f63 100644
--- a/tests/testthat/test-as.s2dv_cube.R
+++ b/tests/testthat/test-as.s2dv_cube.R
@@ -1,5 +1,3 @@
-context("CSTools::as.s2dv_cube tests")
-
 ##############################################
 library(startR)
 library(s2dv)
diff --git a/tests/testthat/test-s2dv_cube.R b/tests/testthat/test-s2dv_cube.R
index a88f6eec5cb5dafbd052812d3dd644f7614e659f..1088b4ce134d483432f6454ea34547ed0dc003ac 100644
--- a/tests/testthat/test-s2dv_cube.R
+++ b/tests/testthat/test-s2dv_cube.R
@@ -1,5 +1,3 @@
-context("CSTools::s2dv_cube tests")
-
 ##############################################
 
 # dat1