PEP8 and general clean up on tests