Added serialization testing