Last chunk of tests and pep8 cleanup