pep8 updates, cleaned out test graveyard.