Removing useless "->andReturnNull()" from mocks
Fixing wrong PHPDoc
Fixing inconsistent PHPDocs