fix merge conflicts from previous commit

Any PRs merged after the one that made testing functions return errors
needs to get rebased!
2299e5ff1dAndrew Kelley committed on 5/9/2021, 6:12:34 AMparentb88d381
1 file changedLine totals unavailable