pep8
Adding tests and stuff