Merge "Add test idempotent IDs when missing"