some formating clean up
fix unit tests to pass
autopep8 clean up