Add flake tests
Correct style in a few files to please Lord Travis