Testing and setup.py updates (setuptools)