diff --git a/tests/TestTopo3D.cpp b/tests/TestTopo3D.cpp
index 8bdcd71f..0e81815e 100644
--- a/tests/TestTopo3D.cpp
+++ b/tests/TestTopo3D.cpp
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
 					z = Dm->kproc()*(Nz-2)+k - CZ -0.1;
 
 					//..............................................................................
-					if (x > 0 && y>0){
+					if (x >= 0 && y>=0){
 						double d1 = R2-sqrt(x*x +(y-R1)*(y-R1) + z*z);
 						double d2 = R2-sqrt((x-R1)*(x-R1)+y*y + z*z);
 						Object.distance(i,j,k) = max(d1,d2);
@@ -166,8 +166,8 @@ int main(int argc, char **argv)
 
 					//..............................................................................
 					// Single torus
-					double d1 = sqrt(x*x+y*y+z*z)-R1;
-					double d2 = (R1-R2)-sqrt(x*x+y*y+z*z);
+					double d1 = sqrt(x*x+y*y+z*z)-(R1-R2);
+					double d2 = R-sqrt(x*x+y*y+z*z);
 					Object.distance(i,j,k) = min(d1,d2);
 
 					if (Object.distance(i,j,k) > 0.0){
@@ -200,9 +200,9 @@ int main(int argc, char **argv)
 
 					//..............................................................................
 					// Bowl
-					if (z < 0 ){
-						double d1 = sqrt(x*x+y*y+z*z)-R1;
-						double d2 = (R1-R2)-sqrt(x*x+y*y+z*z);
+					if (z <= 0 ){
+						double d1 = sqrt(x*x+y*y+z*z)-(R1-R2);
+						double d2 = R-sqrt(x*x+y*y+z*z);
 						Object.distance(i,j,k) = min(d1,d2);
 					}
 					else{