brought back Ellipse and ellipse tests