WIP Fix broken unittests + add more

Refs #60 #112 
@LEDfan can you add this back?