Fixing the geometry equality tests. 2nd try.