Merge branch 'sl/test-wc-l-line-count'

By Stefano Lattarini * sl/test-wc-l-line-count: tests: modernise style: more uses of test_line_count