Undoing some changes to Ellipse
Fixing tests