Fix tests for PHPUnit 4.6