Updating PHPUnit.
Fixing broken tests.