WIP Fix broken unittests + add more

Refs #60 #112 
try to keep lines to max 80 chars