Add setters for ID
Add tests