Cleaned up the files to pass tox -e pep8 and added breadth tests