Fix tests for current Rust