pep8 passing now except E501 line length for both tests and code
small cleanups