Persisti online when generating ID
A few targetted tests
Clearer method name