Almost final commit: test, setup.py, requrements etc