Resolve #3567518 "Cleanup tests"

Stephen Mustgraverequested to merge
issue/extlink-3567518:3567518-cleanup-tests into 2.0.x

Closes #3567518

Merge request reports