4 files changed, 14 insertions, 2 deletions
diff --git a/test/test_bitvec.cpp b/test/test_bitvec.cpp
index e03a27f..d25e3ff 100644
--- a/test/test_bitvec.cpp
+++ b/test/test_bitvec.cpp
@@ -16,6 +16,8 @@
 #include <cstddef>
 #include <cstdlib>
 
+namespace {
+
 template<class T, size_t N>
 void
 test_and(Context& ctx)
@@ -324,6 +326,8 @@ test(Context& ctx)
   test_iteration<T, N>(ctx);
 }
 
+} // namespace
+
 int
 main()
 {
diff --git a/test/test_gray_code_rank.cpp b/test/test_gray_code_rank.cpp
index 1bb70cb..26432b8 100644
--- a/test/test_gray_code_rank.cpp
+++ b/test/test_gray_code_rank.cpp
@@ -19,6 +19,8 @@
 #include <cstddef>
 #include <iterator>
 
+namespace {
+
 template<class T, size_t Max, size_t D>
 T
 get_mask(const std::array<size_t, D>& ms, const size_t d, const size_t step)
@@ -106,6 +108,8 @@ test(Context& ctx)
   test_gray_code_rank<T, Max, D>(ctx);
 }
 
+} // namespace
+
 int
 main()
 {
diff --git a/test/test_hilbert.cpp b/test/test_hilbert.cpp
index 53177ec..6a1862d 100644
--- a/test/test_hilbert.cpp
+++ b/test/test_hilbert.cpp
@@ -33,6 +33,8 @@ _Pragma("clang diagnostic pop")
 #include <cstddef>
 #include <cstdint>
 
+namespace {
+
 /// Return a `D`-dimensional point within `ms` per-dimension precision
 template<size_t D>
 std::array<uint64_t, D>
@@ -159,6 +161,8 @@ test_compact(Context& ctx)
   assert(squared_distance(pa, pb) == 1);
 }
 
+} // namespace
+
 int
 main()
 {
diff --git a/test/test_utils.hpp b/test/test_utils.hpp
index 5f4c03f..cc9c1f8 100644
--- a/test/test_utils.hpp
+++ b/test/test_utils.hpp
@@ -44,7 +44,7 @@ static inline size_t
 rand_between(Context& ctx, const size_t min, const size_t max)
 {
   assert(max >= min);
-  const size_t r = (max == min) ? min : ctx.dist(ctx.rng) % (max - min) + min;
+  const size_t r = (max == min) ? min : (ctx.dist(ctx.rng) % (max - min)) + min;
   assert(r >= min && r < max);
   return r;
 }
@@ -58,7 +58,7 @@ make_random_precisions(Context& ctx)
 
   size_t bits_left = N;
   for (size_t i = 0; i < D; ++i) {
-    ms[i] = rand_between(ctx, 1, std::min(Max, bits_left / (D - i) + 1));
+    ms[i] = rand_between(ctx, 1, std::min(Max, (bits_left / (D - i)) + 1));
     bits_left -= ms[i];
   }