Several fixes, tests and stuff
Bottomful hipspec