Add deserializers and tests for this new classes