fix tests and xstream serialization for backport