Fix mock for latest changes.