more PHPUnit changes