Added JSON serialization/deserialization tests