Adapted to the latest testing changes.