WIP Fix broken unittests + add more

Refs #60 #112 
bad variable name - PHPDoc missing