diff --git a/test/gleam/gleam_community_maths_arithmetics.gleam b/test/gleam_community/maths/arithmetics_test.gleam
similarity index 98%
rename from test/gleam/gleam_community_maths_arithmetics.gleam
rename to test/gleam_community/maths/arithmetics_test.gleam
index 1b83e59..57e6753 100644
--- a/test/gleam/gleam_community_maths_arithmetics.gleam
+++ b/test/gleam_community/maths/arithmetics_test.gleam
@@ -1,11 +1,6 @@
 import gleam_community/maths/arithmetics
-import gleeunit
 import gleeunit/should
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn int_gcd_test() {
   arithmetics.gcd(1, 1)
   |> should.equal(1)
diff --git a/test/gleam/gleam_community_maths_combinatorics.gleam b/test/gleam_community/maths/combinatorics_test.gleam
similarity index 98%
rename from test/gleam/gleam_community_maths_combinatorics.gleam
rename to test/gleam_community/maths/combinatorics_test.gleam
index 052ff1b..d1b3405 100644
--- a/test/gleam/gleam_community_maths_combinatorics.gleam
+++ b/test/gleam_community/maths/combinatorics_test.gleam
@@ -1,13 +1,8 @@
 import gleam_community/maths/combinatorics
 import gleam/set
 import gleam/list
-import gleeunit
 import gleeunit/should
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn int_factorial_test() {
   // Invalid input gives an error
   combinatorics.factorial(-1)
diff --git a/test/gleam/gleam_community_maths_conversion.gleam b/test/gleam_community/maths/conversion_test.gleam
similarity index 94%
rename from test/gleam/gleam_community_maths_conversion.gleam
rename to test/gleam_community/maths/conversion_test.gleam
index 7f3f39c..0a2e793 100644
--- a/test/gleam/gleam_community_maths_conversion.gleam
+++ b/test/gleam_community/maths/conversion_test.gleam
@@ -1,13 +1,8 @@
 import gleam_community/maths/elementary
 import gleam_community/maths/predicates
 import gleam_community/maths/conversion
-import gleeunit
 import gleeunit/should
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_to_degree_test() {
   let assert Ok(tol) = elementary.power(-10.0, -6.0)
   conversion.radians_to_degrees(0.0)
diff --git a/test/gleam/gleam_community_maths_elementary.gleam b/test/gleam_community/maths/elementary_test.gleam
similarity index 99%
rename from test/gleam/gleam_community_maths_elementary.gleam
rename to test/gleam_community/maths/elementary_test.gleam
index 38c8ce3..71c62e8 100644
--- a/test/gleam/gleam_community_maths_elementary.gleam
+++ b/test/gleam_community/maths/elementary_test.gleam
@@ -1,13 +1,8 @@
 import gleam_community/maths/elementary
 import gleam_community/maths/predicates
-import gleeunit
 import gleeunit/should
 import gleam/option
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_acos_test() {
   let assert Ok(tol) = elementary.power(-10.0, -6.0)
   // Check that the function agrees, at some arbitrary input
diff --git a/test/gleam/gleam_community_maths_metrics.gleam b/test/gleam_community/maths/metrics_test.gleam
similarity index 98%
rename from test/gleam/gleam_community_maths_metrics.gleam
rename to test/gleam_community/maths/metrics_test.gleam
index efc20e3..8e407e6 100644
--- a/test/gleam/gleam_community_maths_metrics.gleam
+++ b/test/gleam_community/maths/metrics_test.gleam
@@ -1,13 +1,8 @@
 import gleam_community/maths/elementary
 import gleam_community/maths/metrics
 import gleam_community/maths/predicates
-import gleeunit
 import gleeunit/should
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_list_norm_test() {
   let assert Ok(tol) = elementary.power(-10.0, -6.0)
 
diff --git a/test/gleam/gleam_community_maths_piecewise.gleam b/test/gleam_community/maths/piecewise_test.gleam
similarity index 99%
rename from test/gleam/gleam_community_maths_piecewise.gleam
rename to test/gleam_community/maths/piecewise_test.gleam
index e427700..46d97a4 100644
--- a/test/gleam/gleam_community_maths_piecewise.gleam
+++ b/test/gleam_community/maths/piecewise_test.gleam
@@ -1,14 +1,9 @@
 import gleam_community/maths/piecewise
-import gleeunit
 import gleeunit/should
 import gleam/option
 import gleam/float
 import gleam/int
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_ceiling_test() {
   // Round 3. digit AFTER decimal point 
   piecewise.ceiling(12.0654, option.Some(3))
diff --git a/test/gleam/gleam_community_maths_tests.gleam b/test/gleam_community/maths/predicates_test.gleam
similarity index 98%
rename from test/gleam/gleam_community_maths_tests.gleam
rename to test/gleam_community/maths/predicates_test.gleam
index fa7e80f..a7a13d8 100644
--- a/test/gleam/gleam_community_maths_tests.gleam
+++ b/test/gleam_community/maths/predicates_test.gleam
@@ -1,11 +1,6 @@
 import gleam_community/maths/predicates
 import gleam/list
 import gleeunit/should
-import gleeunit
-
-pub fn main() {
-  gleeunit.main()
-}
 
 pub fn float_is_close_test() {
   let val: Float = 99.0
diff --git a/test/gleam/gleam_community_maths_sequences.gleam b/test/gleam_community/maths/sequences_test.gleam
similarity index 99%
rename from test/gleam/gleam_community_maths_sequences.gleam
rename to test/gleam_community/maths/sequences_test.gleam
index 4898595..ec7afcb 100644
--- a/test/gleam/gleam_community_maths_sequences.gleam
+++ b/test/gleam_community/maths/sequences_test.gleam
@@ -2,13 +2,8 @@ import gleam_community/maths/elementary
 import gleam_community/maths/sequences
 import gleam_community/maths/predicates
 import gleam/list
-import gleeunit
 import gleeunit/should
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_list_linear_space_test() {
   let assert Ok(tol) = elementary.power(-10.0, -6.0)
 
diff --git a/test/gleam/gleam_community_maths_special.gleam b/test/gleam_community/maths/special_test.gleam
similarity index 98%
rename from test/gleam/gleam_community_maths_special.gleam
rename to test/gleam_community/maths/special_test.gleam
index 8c5f54e..b1d9f51 100644
--- a/test/gleam/gleam_community_maths_special.gleam
+++ b/test/gleam_community/maths/special_test.gleam
@@ -1,14 +1,9 @@
 import gleam_community/maths/elementary
 import gleam_community/maths/special
 import gleam_community/maths/predicates
-import gleeunit
 import gleeunit/should
 import gleam/result
 
-pub fn main() {
-  gleeunit.main()
-}
-
 pub fn float_beta_function_test() {
   let assert Ok(tol) = elementary.power(-10.0, -6.0)
 
diff --git a/test/gleam_community_maths_test.gleam b/test/gleam_community_maths_test.gleam
index ba7a929..ecd12ad 100644
--- a/test/gleam_community_maths_test.gleam
+++ b/test/gleam_community_maths_test.gleam
@@ -1,3 +1,5 @@
-@external(erlang, "gleam_community_maths_test_ffi", "main")
-@external(javascript, "./gleam_community_maths_test_ffi.mjs", "main")
-pub fn main() -> Nil
+import gleeunit
+
+pub fn main() {
+  gleeunit.main()
+}