Removing workarounds for PHPUnit Bug now that we are running on PHPUnit 4.