Implement #7944. Use `with` throughout the test suite.
1 file changed