New failing test, fix ed diffs, change line splits