Add mandatory ID

- Fixes tests