Mostly I wanted to add tests for verifying serialization and deserialization, since that's what I modify in my next commit. Change-Id: I8223f2e3e1b3ce79afc8c5cd9ca4afe6d418abf9
