Wrap at 80
Reformat the tests