fix
add test circle and rect