diff --git a/test/pav-utils.js b/test/pav-utils.js
index 9b3f1d9..33509af 100644
--- a/test/pav-utils.js
+++ b/test/pav-utils.js
@@ -74,9 +74,10 @@ function calculateHeading(x1, y1, x2, y2) {
   var dx = x2 - x1;
   var dy = y2 - y1;
   var heading = (Math.atan2(dy, dx) * 180) / Math.PI;
-  if (heading < 0) {
-    heading += 360;
-  }
+
+  // Ensure heading is within the range [0, 360)
+  heading = (heading + 360) % 360;
+
   return heading;
 }