Added more PHPDoc
Fixed @covers annotations