fixup circle and ellipse test cases
Merge remote-tracking branch 'upstream/master'