Rewriting tests for eol/nested