Improve PHPUnit tasks