Fix/unit test

I did some code style / phpdoc cleanup while reading your code.