Fix tests for current PHPUnit version