Update for modern PHPUnit