test: Use the new `for` protocol
Fix merge "failures"