Updated to support PHPunit 4.0.0