Update to PHPUnit 4.2.4
Add missing annotations
Fix annotations