Added serialization of more properties, as well as unit test extensions for these additions.