Use cargo run in more places

Use cargo run as much as possible...