Fix xml serialization and unit test suite is ok