pep8 the tests and some more bits and bobs