Merge branch 'jc/t4122-use-test-write-lines'