Changes in testsuite:
* `test_iter_lines` => `test_make_lines`
* Make some code clean-ups