Fixup Tests for recent phpunit versions