Added serialization tests