Cleanup of Cargo.toml and tests