Simplify code in test suites

Hopefully makes it easier on static analyzers
1 file changed