Switch to scoverage-friendly testing