Fix tests and setup.py