Tests started failing in a few, let's fix them.
Fixed
3.0
Code
Issue #3420465 by swentel: Fix failing tests