No longer always send ID in omni, update tests