Pep8 compliance

This brings the test suite up to pep8 compliance excepting the line-length of 130 characters.