Make our tests work
Test our new partial fix
Finish updating our setup.py