Add serialization test #481