fix unit tests for xml serialization