Added serialization tests back in