Reformat (and update test) so that url is on its own line, and all lines are at most 80 chars