Some more phpunit fixes