Bug fixes in 2D Geometry classes and Tests