Add another patch from upstream fixing tests.
Remove patch that was integrated upstream.