ERRAI-621: All serialization tests passing using deferred generators