Add option for including ID on serialization
Add basic tests for serialization