Fix failing tests in 2.x

Merge request reports

Loading