Clean up setup.py and test.py