Improve coverage in polygon and circle