Tweak/update phpdoc
Update tests.