Make "./setup.py test" work better