Cleanup/pep8 tests

A batch of PEP8 changes for the tests