Upgraded to setup.py tests