diff --git a/tests/testthat/test-dyad.R b/tests/testthat/test-dyad-id.R
similarity index 97%
rename from tests/testthat/test-dyad.R
rename to tests/testthat/test-dyad-id.R
index 58e4ecdb..bbd5538b 100644
--- a/tests/testthat/test-dyad.R
+++ b/tests/testthat/test-dyad-id.R
@@ -1,4 +1,5 @@
-context("test-dyad")
+# Test dyad_id
+context("test dyad_id")
 
 library(spatsoc)
 
diff --git a/tests/testthat/test-edge-dist.R b/tests/testthat/test-edge-dist.R
index 2855f2a7..e9be02a8 100644
--- a/tests/testthat/test-edge-dist.R
+++ b/tests/testthat/test-edge-dist.R
@@ -1,3 +1,4 @@
+# Test edge_dist
 context("test-edge-dist")
 
 library(spatsoc)
diff --git a/tests/testthat/test-edge-nn.R b/tests/testthat/test-edge-nn.R
index e63aae39..2d534267 100644
--- a/tests/testthat/test-edge-nn.R
+++ b/tests/testthat/test-edge-nn.R
@@ -1,3 +1,4 @@
+# Test edge_nn
 context("test-edge-nn")
 
 library(spatsoc)
diff --git a/tests/testthat/test-fusion-id.R b/tests/testthat/test-fusion-id.R
index 44030259..a6dd9b60 100644
--- a/tests/testthat/test-fusion-id.R
+++ b/tests/testthat/test-fusion-id.R
@@ -1,3 +1,4 @@
+# Test fusion_id
 context("test-fusion-id")
 
 library(spatsoc)
diff --git a/tests/testthat/test-gbi.R b/tests/testthat/test-get-gbi.R
similarity index 99%
rename from tests/testthat/test-gbi.R
rename to tests/testthat/test-get-gbi.R
index b589ae8b..f3c1a16e 100644
--- a/tests/testthat/test-gbi.R
+++ b/tests/testthat/test-get-gbi.R
@@ -1,5 +1,6 @@
-# Test GBI
+# Test get_gbi
 context('test get_gbi')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv')
diff --git a/tests/testthat/test-group-lines.R b/tests/testthat/test-group-lines.R
index 74ac4664..6c9936fc 100644
--- a/tests/testthat/test-group-lines.R
+++ b/tests/testthat/test-group-lines.R
@@ -1,5 +1,6 @@
 # Test group_lines
 context('test group_lines')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv')
diff --git a/tests/testthat/test-group-polys.R b/tests/testthat/test-group-polys.R
index 49b9ba43..f7645424 100644
--- a/tests/testthat/test-group-polys.R
+++ b/tests/testthat/test-group-polys.R
@@ -1,5 +1,6 @@
 # Test group_polys
 context('test group_polys')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv')
diff --git a/tests/testthat/test-pts.R b/tests/testthat/test-group-pts.R
similarity index 99%
rename from tests/testthat/test-pts.R
rename to tests/testthat/test-group-pts.R
index e10d9394..30d06543 100644
--- a/tests/testthat/test-pts.R
+++ b/tests/testthat/test-group-pts.R
@@ -1,5 +1,6 @@
-# Test Points
+# Test group_pts
 context('test group_pts')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv')
diff --git a/tests/testthat/test-time.R b/tests/testthat/test-group-times.R
similarity index 99%
rename from tests/testthat/test-time.R
rename to tests/testthat/test-group-times.R
index f048be5f..3f537372 100644
--- a/tests/testthat/test-time.R
+++ b/tests/testthat/test-group-times.R
@@ -1,9 +1,9 @@
 # Test group_times
 context('test group_times')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv', tz = 'UTC')
-# Sys.setenv(TZ='GMT')
 
 test_that('DT is required', {
   expect_error(group_times(DT = NULL,
diff --git a/tests/testthat/test-random.R b/tests/testthat/test-randomizations.R
similarity index 99%
rename from tests/testthat/test-random.R
rename to tests/testthat/test-randomizations.R
index 3c29d021..c32506d6 100644
--- a/tests/testthat/test-random.R
+++ b/tests/testthat/test-randomizations.R
@@ -1,5 +1,6 @@
-# Test Random
+# Test randomizations
 context('test randomizations')
+
 library(spatsoc)
 
 DT <- fread('../testdata/DT.csv')