Update to PHPUnit 4.0.14
Add missing annotations
Cleanup