fixed up Circle and Ellipse tests