Updated for phpunit 4.0
Merge 4.1.