Split long lines & add tests