Rationalise test_circle(s)