Fix failing tests to use new serialization method