diff --git a/DESCRIPTION b/DESCRIPTION
index 90e0e83155393c8d19d68ea8c92b9c0121f6153f..4151ba48204d6c18077b6610edda77ed8ad2c0a8 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -40,3 +40,4 @@ URL: https://earth.bsc.es/gitlab/es/csindicators/
 BugReports: https://earth.bsc.es/gitlab/es/csindicators/-/issues
 Encoding: UTF-8
 RoxygenNote: 7.2.0
+Config/testthat/edition: 3
\ No newline at end of file
diff --git a/tests/testthat/test-AbsToProbs.R b/tests/testthat/test-AbsToProbs.R
index 902b3f11cfd7be18a2ee3d8338388baacac34e1d..c2cdc9f2371304818a7b3514e4ec8ba2d5231a16 100644
--- a/tests/testthat/test-AbsToProbs.R
+++ b/tests/testthat/test-AbsToProbs.R
@@ -1,5 +1,3 @@
-context("CSIndicators::AbsToProbs tests")
-
 ##############################################
 # dat1
 dat1 <- NULL
diff --git a/tests/testthat/test-AccumulationExceedingThreshold.R b/tests/testthat/test-AccumulationExceedingThreshold.R
index a6b598e79df666b4b11e1d3e6c6cd09e3c895d90..0331e8efae5e2f444bed43ccf3ca6891c93fd9c1 100644
--- a/tests/testthat/test-AccumulationExceedingThreshold.R
+++ b/tests/testthat/test-AccumulationExceedingThreshold.R
@@ -1,5 +1,4 @@
-context("CSIndicators::AccumulationExceedingThreshold tests")
-
+##############################################
 # dat1
 dat1 <- 1:20
 
diff --git a/tests/testthat/test-MergeRefToExp.R b/tests/testthat/test-MergeRefToExp.R
index 2c3e8f65637be858ef835dd10ba07e9e4a871938..adbdfd6f42f1994d0bdf3ba5626df49b1a11cc7d 100644
--- a/tests/testthat/test-MergeRefToExp.R
+++ b/tests/testthat/test-MergeRefToExp.R
@@ -1,5 +1,3 @@
-context("CSIndicators::MergeRefToExp tests")
-
 ###########################################################################
 
 test_that("Sanity checks", {
diff --git a/tests/testthat/test-PeriodAccumulation.R b/tests/testthat/test-PeriodAccumulation.R
index 777dc30cbe09cb21109d1d9506a2922563d8127f..81718f5d9337fc6f39158bcc8d94a8d5e0a02d0f 100644
--- a/tests/testthat/test-PeriodAccumulation.R
+++ b/tests/testthat/test-PeriodAccumulation.R
@@ -1,5 +1,4 @@
-context("CSIndicators::PeriodAccumulation tests")
-
+##############################################
 test_that("Sanity Checks", {
   expect_error(
     PeriodAccumulation('x'), 
diff --git a/tests/testthat/test-PeriodMean.R b/tests/testthat/test-PeriodMean.R
index 7576b1139ea2d05a7dbf2487012f99ac75e51712..41866399e21aa251dfd3018607f6219ef7de85a0 100644
--- a/tests/testthat/test-PeriodMean.R
+++ b/tests/testthat/test-PeriodMean.R
@@ -1,5 +1,4 @@
-context("CSIndicators::PeriodMean tests")
-
+##############################################
 test_that("Sanity Checks", {
   expect_error(
     PeriodMean('x'), 
diff --git a/tests/testthat/test-QThreshold.R b/tests/testthat/test-QThreshold.R
index 41cc3e5312d1e7d56d698bd0c1f6432772e06608..deb35df4d97d1263568b621cfac5d46ae4d63795 100644
--- a/tests/testthat/test-QThreshold.R
+++ b/tests/testthat/test-QThreshold.R
@@ -1,5 +1,4 @@
-context("CSIndicators::QThreshold tests")
-
+##############################################
 test_that("Sanity checks", {
   expect_error(
     QThreshold(NULL),
diff --git a/tests/testthat/test-SelectPeriod.R b/tests/testthat/test-SelectPeriod.R
index 1c264c2b2ef5f88a85fb2ddac70f77908efd9ff9..deb865617a989069f9cdb336f8067a8b2efe3501 100644
--- a/tests/testthat/test-SelectPeriod.R
+++ b/tests/testthat/test-SelectPeriod.R
@@ -1,4 +1,4 @@
-context("CSIndicators::SelectPeriodOnData and SelectPeriodOnDates tests")
+##############################################
 
 library(s2dv)
 
diff --git a/tests/testthat/test-Threshold.R b/tests/testthat/test-Threshold.R
index 24ca6010fd895b35b824f5c83fba030280b3d45f..84e4e0d02ba41aa9bc488d3e83a5c4c45c0ca315 100644
--- a/tests/testthat/test-Threshold.R
+++ b/tests/testthat/test-Threshold.R
@@ -1,5 +1,4 @@
-context("CSIndicators::Threshold tests")
-
+##############################################
 test_that("Sanity checks", {
   expect_error(
     Threshold(NULL),
diff --git a/tests/testthat/test-TotalSpellTimeExceedingThreshold.R b/tests/testthat/test-TotalSpellTimeExceedingThreshold.R
index d2155298df51c082450d75c7d449293020ff3c07..36e46cf88e3a199019c5a7edfffd6b60a9ec8e94 100644
--- a/tests/testthat/test-TotalSpellTimeExceedingThreshold.R
+++ b/tests/testthat/test-TotalSpellTimeExceedingThreshold.R
@@ -1,4 +1,4 @@
-context("CSIndicators::TotalSpellTimeExceedingThreshold tests")
+##############################################
 
 # dat1
 dat <- array(1:20, dim = c(2, 10))
diff --git a/tests/testthat/test-TotalTimeExceedingThreshold.R b/tests/testthat/test-TotalTimeExceedingThreshold.R
index 68c6d777f2dddb896380cb902488451680862cba..1c3ca19d6e1fbf82e4c212d6eebea2f093c3c3e2 100644
--- a/tests/testthat/test-TotalTimeExceedingThreshold.R
+++ b/tests/testthat/test-TotalTimeExceedingThreshold.R
@@ -1,4 +1,4 @@
-context("CSIndicators::TotalTimeExceedingThreshold tests")
+##############################################
 
 # dat1
 dat <- array(1:20, dim = c(2, 10))
diff --git a/tests/testthat/test-WindCapacityFactor.R b/tests/testthat/test-WindCapacityFactor.R
index 1bf9089e2fd3eef4ee9903f4c136f5fdf22c5906..bcecdbce63a017d91e05c5326168d806b01ab334 100644
--- a/tests/testthat/test-WindCapacityFactor.R
+++ b/tests/testthat/test-WindCapacityFactor.R
@@ -1,4 +1,4 @@
-context("CSIndicators::WindCapacityFactor tests")
+##############################################
 
 # dat1
 wind <- NULL
diff --git a/tests/testthat/test-WindPowerDensity.R b/tests/testthat/test-WindPowerDensity.R
index 249c5290cfb43ddf49ba7bacef4747875763de32..184b06296759fa49dd237b001812fb63f8aecf9a 100644
--- a/tests/testthat/test-WindPowerDensity.R
+++ b/tests/testthat/test-WindPowerDensity.R
@@ -1,4 +1,4 @@
-context("CSIndicators::WindPowerDensity tests")
+###########################################################################
 
 # dat1
 wind <- NULL