PHPUnit 4.x compatibility fixes