messing around with tests a bit, but I think I'm more or less done with this. It will never see the light of day anyway
Merge branch 'master' of https://github.com/julianjelfs/hsa