Migrate to cargo (p061-p065)
fix test fallout