Redid setup.py. added run tests