WIP Fix broken unittests + add more

Refs #60 #112 
you should keep this if you want the code coverage to be displayed on scrutinizer