Pin more versions
Pep8 fix
Add tests