cleanup
cleanup
add cv tests