Added tests, updated setup.py to be more compliant with distutils convention