Fixing setup.py
Fix failing tests