pep8 fixes
Add more tests