Cleanup tests
Cleanup setup.py