Fix tests.
Fix circle geometry test after merge.