Using setuptools from now on
Fix tests and tidying up