Pep 8
Add tests
Add more tests