Fixed serialization tests