Pep8 fixes
Added unit testing