Fix serialization tests