Fixed tests + fixed phpdoc.