Updated tests, and setup.py