Fix idempotence
Restore test