Fix cargo-run rebasings and tests

Closes #443