HM: Fixed setup.py and testsetup