Moar tests
Removed unused stuff from setup.py