remove generation of newlines, alter tests to match