More infrastructure, improved setup.py file, add py.test