Added possiblity for new line split, plus a test for it