Fixing (hopefully) PHP 5.3 PHPUnit tests breakage