Changed $this-> to self::
Rewrited unit-test according to code-review
CS Fix