Fix up pep8/testing