Adding support for new PHPUnit versions