diff --git a/tests/DetectorGeometryTest.cpp b/tests/DetectorGeometryTest.cpp
index fb42b6f1..49ccd6b4 100644
--- a/tests/DetectorGeometryTest.cpp
+++ b/tests/DetectorGeometryTest.cpp
@@ -230,8 +230,8 @@ TEST_CASE("DetectorGeometryModular_Limit", "[DetectorGeometry]") {
     DetectorGeometryModular geometry(module_geom);
 
     REQUIRE(geometry.GetModulesNum() == 2);
-    CHECK(geometry.GetWidth(true) == 5000 + 513 - (-100 - 1029));
-    CHECK(geometry.GetHeight(true) == 2999 + 513 - 500);
+    CHECK(geometry.GetWidth(true) == 5000 + 514 - (-100 - 1030) - 1);
+    CHECK(geometry.GetHeight(true) == 2999 - 500 + 1);
 }
 
 TEST_CASE("DetectorGeometryModular_Custom_Mirror", "[DetectorGeometry]") {
diff --git a/tests/ImageMetadataTest.cpp b/tests/ImageMetadataTest.cpp
index d5795413..7bacaf62 100644
--- a/tests/ImageMetadataTest.cpp
+++ b/tests/ImageMetadataTest.cpp
@@ -61,8 +61,8 @@ TEST_CASE("ImageMetadata_ROI_flipped_module") {
     REQUIRE(message.roi.size() == 1);
     REQUIRE(message.roi.contains("roi1"));
     REQUIRE(message.roi["roi1"].sum == sum);
-    REQUIRE(message.roi["roi1"].x_weighted == sum * (23 + 45) );
-    REQUIRE(message.roi["roi1"].y_weighted == sum * (1811 - 50));
+    CHECK(message.roi["roi1"].x_weighted / sum == 23 );
+    CHECK(message.roi["roi1"].y_weighted / sum == 1029 - 50);
 }
 
 TEST_CASE("ImageMetadata_PulseID_mismatch") {