Fixup whitespace and line lengths
Merge pull request #113 from jhamrick/fix-whitespace-in-tests

Fixup whitespace and line lengths