Modifications to work with new PHPUnit annotation resolution.