Updated for phpunit 4.0