Refs #19418 Envelope.rdf small refactor and unit test