Added tests. Added package files.  Made closer to pep8