Improve Circle Tests for Better Direction