(was merged as part of https://github.com/rust-lang/rust/pull/62782 )
Changes: - Fix stderr breaking the tests - Adding tests over the if arms