Use correct bucketi data in combination tests