bump versions
rm TODO
add more expectations