Change setup.py and test