fix merge conflicts from previous commit
fix merge conflicts from previous commit

Any PRs merged after the one that made testing functions return errors
needs to get rebased!

andrewrk/zig,zig-lang/zig,andrewrk/zig,zig-lang/zig,zig-lang/zig