Fixing setup.py (passes: python setup.py test)