Get tests passing again

Closes #3583098

Merge request reports

Loading