sync tests to code changes; fix recursive ring/area