Fix test
Restore on GenerateEntityIdOnTheClient
Restore converter & test file.