Fix tests for rustup branch