Add tests for circle
Add tests for ellipse and rect